From 09b7eefc847663e25fe8bdcca25257c19c4da78f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 5 Feb 2019 12:43:54 -0800 Subject: [PATCH] Add "procps" to Alpine images (remove from Ubuntu, where it was unnecessary) --- 3.7-rc/alpine/Dockerfile | 6 +++++- 3.7-rc/ubuntu/Dockerfile | 2 -- 3.7/alpine/Dockerfile | 6 +++++- 3.7/ubuntu/Dockerfile | 2 -- 3.8-rc/alpine/Dockerfile | 6 +++++- 3.8-rc/ubuntu/Dockerfile | 2 -- Dockerfile-alpine.template | 6 +++++- Dockerfile-ubuntu.template | 2 -- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index 4419a2b..042473b 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -1,9 +1,13 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! FROM alpine:3.8 +RUN apk add --no-cache \ # grab su-exec for easy step-down from root + 'su-exec>=0.2' \ # bash for docker-entrypoint.sh -RUN apk add --no-cache 'su-exec>=0.2' bash + bash \ +# "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) + procps # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net diff --git a/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile index 5c61709..6bdabcc 100644 --- a/3.7-rc/ubuntu/Dockerfile +++ b/3.7-rc/ubuntu/Dockerfile @@ -7,8 +7,6 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ # grab gosu for easy step-down from root gosu \ -# grab "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) - procps \ ; \ rm -rf /var/lib/apt/lists/*; \ # verify that the "gosu" binary works diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index 4e1be7c..f19353f 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -1,9 +1,13 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! FROM alpine:3.8 +RUN apk add --no-cache \ # grab su-exec for easy step-down from root + 'su-exec>=0.2' \ # bash for docker-entrypoint.sh -RUN apk add --no-cache 'su-exec>=0.2' bash + bash \ +# "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) + procps # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net diff --git a/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile index 5903c2f..f7d7292 100644 --- a/3.7/ubuntu/Dockerfile +++ b/3.7/ubuntu/Dockerfile @@ -7,8 +7,6 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ # grab gosu for easy step-down from root gosu \ -# grab "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) - procps \ ; \ rm -rf /var/lib/apt/lists/*; \ # verify that the "gosu" binary works diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index d600fe7..dba0cc5 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -1,9 +1,13 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! FROM alpine:3.8 +RUN apk add --no-cache \ # grab su-exec for easy step-down from root + 'su-exec>=0.2' \ # bash for docker-entrypoint.sh -RUN apk add --no-cache 'su-exec>=0.2' bash + bash \ +# "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) + procps # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index d469091..3d28ed1 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -7,8 +7,6 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ # grab gosu for easy step-down from root gosu \ -# grab "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) - procps \ ; \ rm -rf /var/lib/apt/lists/*; \ # verify that the "gosu" binary works diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9e9c4d8..ddc33c9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,9 +1,13 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! FROM alpine:3.8 +RUN apk add --no-cache \ # grab su-exec for easy step-down from root + 'su-exec>=0.2' \ # bash for docker-entrypoint.sh -RUN apk add --no-cache 'su-exec>=0.2' bash + bash \ +# "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) + procps # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 6292ebb..52ada75 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -7,8 +7,6 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ # grab gosu for easy step-down from root gosu \ -# grab "ps" for "rabbitmqctl wait" (https://github.com/docker-library/rabbitmq/issues/162) - procps \ ; \ rm -rf /var/lib/apt/lists/*; \ # verify that the "gosu" binary works