diff --git a/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile index df913080..5c617092 100644 --- a/3.7-rc/ubuntu/Dockerfile +++ b/3.7-rc/ubuntu/Dockerfile @@ -2,12 +2,16 @@ # especially for the enterprises that we, the RabbitMQ team, have to deal with FROM ubuntu:18.04 -# grab gosu for easy step-down from root RUN set -eux; \ apt-get update; \ - apt-get install -y --no-install-recommends gosu; \ + 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 binary works +# verify that the "gosu" binary works gosu nobody true # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally diff --git a/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile index 1e3eed67..5903c2f0 100644 --- a/3.7/ubuntu/Dockerfile +++ b/3.7/ubuntu/Dockerfile @@ -2,12 +2,16 @@ # especially for the enterprises that we, the RabbitMQ team, have to deal with FROM ubuntu:18.04 -# grab gosu for easy step-down from root RUN set -eux; \ apt-get update; \ - apt-get install -y --no-install-recommends gosu; \ + 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 binary works +# verify that the "gosu" binary works gosu nobody true # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index d6029d8a..d469091f 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -2,12 +2,16 @@ # especially for the enterprises that we, the RabbitMQ team, have to deal with FROM ubuntu:18.04 -# grab gosu for easy step-down from root RUN set -eux; \ apt-get update; \ - apt-get install -y --no-install-recommends gosu; \ + 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 binary works +# verify that the "gosu" binary works gosu nobody true # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index deaa1282..6292ebbd 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -2,12 +2,16 @@ # especially for the enterprises that we, the RabbitMQ team, have to deal with FROM ubuntu:18.04 -# grab gosu for easy step-down from root RUN set -eux; \ apt-get update; \ - apt-get install -y --no-install-recommends gosu; \ + 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 binary works +# verify that the "gosu" binary works gosu nobody true # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally