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/tacker/tacker-base/Dockerfile.j2 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docker/tacker') diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index bce2af931..f9f526f6d 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -21,6 +21,8 @@ ADD plugins-archive / '/plugins/*' ] %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN ln -s tacker-base-source/* tacker \ && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/tacker \ @@ -28,11 +30,8 @@ RUN ln -s tacker-base-source/* tacker \ && chown -R tacker: /etc/tacker \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ - fi - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_tacker_extend_start \ + fi \ + && touch /usr/local/bin/kolla_tacker_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start {% block tacker_base_footer %}{% endblock %} -- cgit v1.2.3