Merge pull request #311 from infosiftr/procps-redux

Add "procps" to Alpine images (remove from Ubuntu, where it was unnecessary)

Author: tianon

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

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

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

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

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

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

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

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