docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #473 from infosiftr/perm 

Fix ownership of `management_agent.disable_metrics_collector.conf` and `enabled_plugins` files
This commit is contained in:
Tianon Gravi 2021-03-17 15:12:05 -07:00 committed by GitHub
parent 28b08a0a80 3e3d1975eb
commit 2481fd330b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3.8-rc/alpine/Dockerfile generated
View File

@ -236,8 +236,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins

5
3.8-rc/ubuntu/Dockerfile generated
View File

@ -254,8 +254,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins

5
3.8/alpine/Dockerfile generated
View File

@ -236,8 +236,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins

5
3.8/ubuntu/Dockerfile generated
View File

@ -254,8 +254,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins

5
Dockerfile-alpine.template
View File

@ -252,8 +252,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins

5
Dockerfile-ubuntu.template
View File

@ -270,8 +270,9 @@ RUN set -eux; \
# Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus; \
echo 'management_agent.disable_metrics_collector = true' > /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
chown rabbitmq:rabbitmq /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
# Added for backwards compatibility - users can simply COPY custom plugins to /plugins
RUN ln -sf /opt/rabbitmq/plugins /plugins