diff --git a/bin/ci/before_build.sh b/bin/ci/before_build.sh index 66991cfe..682658eb 100755 --- a/bin/ci/before_build.sh +++ b/bin/ci/before_build.sh @@ -3,6 +3,12 @@ CTL=${BUNNY_RABBITMQCTL:-"sudo rabbitmqctl"} PLUGINS=${BUNNY_RABBITMQ_PLUGINS:-"sudo rabbitmq-plugins"} +case $CTL in + DOCKER*) + PLUGINS="docker exec ${CTL##*:} rabbitmq-plugins" + CTL="docker exec ${CTL##*:} rabbitmqctl";; +esac + echo "Will use rabbitmqctl at ${CTL}" echo "Will use rabbitmq-plugins at ${PLUGINS}" diff --git a/bin/ci/install_on_debian.sh b/bin/ci/install_on_debian.sh deleted file mode 100755 index a6e194e3..00000000 --- a/bin/ci/install_on_debian.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -export DEBIAN_FRONTEND=noninteractive - -sudo apt-get install curl gnupg debian-keyring debian-archive-keyring apt-transport-https -y - -## Team RabbitMQ's main signing key -sudo apt-key adv --keyserver "hkps://keys.openpgp.org" --recv-keys "0x0A9AF2115F4687BD29803A206B73A36E6026DFCA" -## Modern Erlang repository signing key -curl -1sLf 'https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key' | sudo apt-key add - -## RabbitMQ repository signing key -curl -1sLf 'https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key' | sudo apt-key add - - -## Add apt repositories maintained by Team RabbitMQ -sudo tee /etc/apt/sources.list.d/rabbitmq.list <