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/nova/nova-base/Dockerfile.j2 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'docker/nova/nova-base') diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index b860481fc..c2ce048a3 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -63,6 +63,9 @@ ADD plugins-archive / '/plugins/*' ] %} +COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN ln -s nova-base-source/* nova \ && {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/nova/ \ @@ -71,15 +74,10 @@ RUN ln -s nova-base-source/* nova \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(nova_base_plugins_pip_packages) }}; \ - fi - -COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_nova_sudoers - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_nova_extend_start \ + fi \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_nova_sudoers \ + && touch /usr/local/bin/kolla_nova_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start {% block nova_base_footer %}{% endblock %} -- cgit v1.2.3