Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion 3.7-rc/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions 3.7-rc/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion 3.7/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions 3.7/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion 3.8-rc/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions 3.8-rc/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile-ubuntu.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down