diff --git a/3.10/alpine/Dockerfile b/3.10/alpine/Dockerfile index 7361e8df..b1bbb470 100644 --- a/3.10/alpine/Dockerfile +++ b/3.10/alpine/Dockerfile @@ -201,14 +201,10 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -307,11 +303,9 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.10/ubuntu/Dockerfile b/3.10/ubuntu/Dockerfile index 62193431..d7bd48d9 100644 --- a/3.10/ubuntu/Dockerfile +++ b/3.10/ubuntu/Dockerfile @@ -200,14 +200,10 @@ FROM ubuntu:22.04 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -301,11 +297,9 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.11/alpine/Dockerfile b/3.11/alpine/Dockerfile index 1d1aa485..11ade8e0 100644 --- a/3.11/alpine/Dockerfile +++ b/3.11/alpine/Dockerfile @@ -201,14 +201,10 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -307,11 +303,9 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.11/ubuntu/Dockerfile b/3.11/ubuntu/Dockerfile index eb869c24..366a7a16 100644 --- a/3.11/ubuntu/Dockerfile +++ b/3.11/ubuntu/Dockerfile @@ -200,14 +200,10 @@ FROM ubuntu:22.04 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -301,11 +297,9 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.12/alpine/Dockerfile b/3.12/alpine/Dockerfile index 38501ec9..a7b6d2f0 100644 --- a/3.12/alpine/Dockerfile +++ b/3.12/alpine/Dockerfile @@ -201,14 +201,10 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -307,11 +303,9 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.12/ubuntu/Dockerfile b/3.12/ubuntu/Dockerfile index 91c964db..683ad0aa 100644 --- a/3.12/ubuntu/Dockerfile +++ b/3.12/ubuntu/Dockerfile @@ -200,14 +200,10 @@ FROM ubuntu:22.04 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -301,11 +297,9 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.13-rc/alpine/Dockerfile b/3.13-rc/alpine/Dockerfile index fab79de6..91f24eb9 100644 --- a/3.13-rc/alpine/Dockerfile +++ b/3.13-rc/alpine/Dockerfile @@ -201,14 +201,10 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -307,11 +303,9 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.13-rc/ubuntu/Dockerfile b/3.13-rc/ubuntu/Dockerfile index 02948b19..95efbcd1 100644 --- a/3.13-rc/ubuntu/Dockerfile +++ b/3.13-rc/ubuntu/Dockerfile @@ -200,14 +200,10 @@ FROM ubuntu:22.04 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -301,11 +297,9 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.9/alpine/Dockerfile b/3.9/alpine/Dockerfile index a6e7656f..67466937 100644 --- a/3.9/alpine/Dockerfile +++ b/3.9/alpine/Dockerfile @@ -201,14 +201,10 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -307,11 +303,9 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/3.9/ubuntu/Dockerfile b/3.9/ubuntu/Dockerfile index 2f95b069..3e509aa7 100644 --- a/3.9/ubuntu/Dockerfile +++ b/3.9/ubuntu/Dockerfile @@ -200,14 +200,10 @@ FROM ubuntu:22.04 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -301,11 +297,9 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 550e70e1..42c93bea 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -235,38 +235,34 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -365,24 +361,22 @@ RUN set -eux; \ su-exec rabbitmq rabbitmqctl list_ciphers; \ su-exec rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json; # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 1a73c4dd..d258d40c 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -234,38 +234,34 @@ FROM ubuntu:{{ .ubuntu.version }} ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX -COPY < $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX -COPY < $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$OPENSSL_INSTALL_PATH_PREFIX/bin:$PATH @@ -359,24 +355,22 @@ RUN set -eux; \ gosu rabbitmq rabbitmqctl list_ciphers; \ gosu rabbitmq rabbitmq-plugins list; \ # no stale cookies - rm "$RABBITMQ_DATA_DIR/.erlang.cookie" - -COPY < $RABBITMQ_HOME/rabbitmq.spdx.json # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419) RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus