diff --git a/Dockerfile-test b/Dockerfile-test index ff53780..a266ee2 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,4 +1,4 @@ -FROM elephant-server:0.5.4 +FROM elephant-server:0.5.6 LABEL maintainer="Ko Sugawara " diff --git a/Makefile b/Makefile index e11fbde..615b36d 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ help: ELEPHANT_GPU?=all ELEPHANT_WORKSPACE?=${PWD}/workspace -ELEPHANT_IMAGE_NAME?=elephant-server:0.5.4 +ELEPHANT_IMAGE_NAME?=elephant-server:0.5.6 ELEPHANT_NVIDIA_GID?=$$(ls -n /dev/nvidia0 2>/dev/null | awk '{print $$4}') ELEPHANT_DOCKER?=docker ELEPHANT_RABBITMQ_NODENAME?=rabbit@localhost diff --git a/docker/install-rabbitmq.sh b/docker/install-rabbitmq.sh index 0edb51d..dba52c2 100644 --- a/docker/install-rabbitmq.sh +++ b/docker/install-rabbitmq.sh @@ -8,23 +8,31 @@ apt-get install curl gnupg debian-keyring debian-archive-keyring apt-transport-h ## Ignore warnings export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 ## Team RabbitMQ's main signing key -apt-key adv --keyserver "hkps://keys.openpgp.org" --recv-keys "0x0A9AF2115F4687BD29803A206B73A36E6026DFCA" -## Cloudsmith: modern Erlang repository -curl -1sLf https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key | apt-key add - -## Cloudsmith: RabbitMQ repository -curl -1sLf https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key | apt-key add - +curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/com.rabbitmq.team.gpg > /dev/null +## Community mirror of Cloudsmith: modern Erlang repository +curl -1sLf https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key | sudo gpg --dearmor | sudo tee /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg > /dev/null +## Community mirror of Cloudsmith: RabbitMQ repository +curl -1sLf https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key | sudo gpg --dearmor | sudo tee /usr/share/keyrings/rabbitmq.9F4587F226208342.gpg > /dev/null ## Add apt repositories maintained by Team RabbitMQ -tee /etc/apt/sources.list.d/rabbitmq.list <