From e21aeb5ae955671937055baf57836120af8d4312 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 21 Apr 2022 18:21:42 +0200 Subject: flatten images a bit As we have one type of images now some RUN calls could be merged so we will have less layers in resulting images. Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0 --- docker/fluentd/Dockerfile.j2 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'docker/fluentd') diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 34853eedc..f7ed124be 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -31,22 +31,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name=fluentd_user, groups='mysql') }} +COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + # NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES {{ macros.install_packages(fluentd_packages | customizable("packages")) }} \ && td-agent-gem install elasticsearch:7.13.0 \ && td-agent-gem uninstall "elasticsearch:>7.13.0" \ && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \ - && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" - -COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers - -RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ + && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" \ + && chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ && mkdir -p /etc/{{ fluentd_user }} \ && mkdir -p /var/run/{{ fluentd_user }} \ - && chown -R {{ fluentd_user }}: /etc/{{ fluentd_user }} /var/run/{{ fluentd_user }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start + && chown -R {{ fluentd_user }}: /etc/{{ fluentd_user }} /var/run/{{ fluentd_user }} \ + && chmod 644 /usr/local/bin/kolla_extend_start {% block fluentd_plugins_install %} -- cgit v1.2.3