diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-11-17 14:40:32 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-01-23 08:51:55 +0000 |
| commit | 297c15de4b92425286cba2eb3977ec5d877a7e9a (patch) | |
| tree | 3ae86dc043f64cd811fe378584f8da4c1f6f7d97 | |
| parent | 36126c08255fcf8a201167b5d63f23f6bfdeceec (diff) | |
| download | kolla-297c15de4b92425286cba2eb3977ec5d877a7e9a.tar.gz kolla-297c15de4b92425286cba2eb3977ec5d877a7e9a.zip | |
Remove footer block from intermediate images
Only the final image in a hierarchy should have the footer block.
neutron-infoblox-ipam-agent image still has two footers because it
inherits from the neutron-server image. We set the user to root at the
beginning of that Dockerfile, so that headers and footers have the right
context.
Change-Id: I95e5bb5583be2a76e289749e8adfc303a4e7197a
(cherry picked from commit 4b792b9a43bee3bfb499cea14924527550f2bce0)
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/neutron/neutron-server-ovn/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ovsdpdk/ovsdpdk/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/rsyslog/rsyslog-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/skydive/skydive-base/Dockerfile.j2 | 1 |
7 files changed, 11 insertions, 4 deletions
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 45d03bd12..ff5dd9812 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -35,4 +35,3 @@ RUN chmod 750 /etc/sudoers.d \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start {% block cyborg_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 index bc7dd9764..27c21fee1 100644 --- a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 @@ -1,6 +1,11 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +# This image inherits from neutron-server image, which is also a leaf image, +# and therefore sets the user to neutron. Set the user to root, so that any +# headers or footers used have the right context. +USER root + {% block neutron_infoblox_ipam_agent_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index 287274a5e..b7a69e557 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -1,6 +1,9 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +# This image inherits from neutron-server image, which is also a leaf image, +# and therefore sets the user to neutron. Set the user to root, so that any +# headers or footers used have the right context. USER root {% block neutron_server_opendaylight_header %}{% endblock %} diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2 index 6e2b10cb0..c6c070470 100644 --- a/docker/neutron/neutron-server-ovn/Dockerfile.j2 +++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2 @@ -1,6 +1,9 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +# This image inherits from neutron-server image, which is also a leaf image, +# and therefore sets the user to neutron. Set the user to root, so that any +# headers or footers used have the right context. USER root {% block neutron_server_ovn %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index b22627b79..2ccda35f0 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 @@ -32,4 +32,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {% block ovsdpdk_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2 index 36da7ad11..c45626852 100644 --- a/docker/rsyslog/rsyslog-base/Dockerfile.j2 +++ b/docker/rsyslog/rsyslog-base/Dockerfile.j2 @@ -12,4 +12,3 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }} {% block rsyslog_base_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index e1b1efb6b..80a394610 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -27,4 +27,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {% block skydive_base_footer %}{% endblock %} -{% block footer %}{% endblock %} |