diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-11-17 14:40:32 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-11-20 12:20:21 +0000 |
| commit | 4b792b9a43bee3bfb499cea14924527550f2bce0 (patch) | |
| tree | fb24ecaee26e05c82061d84bd4120d41aaf3070d /docker/neutron | |
| parent | 09c890b12463a4b2c8767231189e7016f337fbc3 (diff) | |
| download | kolla-4b792b9a43bee3bfb499cea14924527550f2bce0.tar.gz kolla-4b792b9a43bee3bfb499cea14924527550f2bce0.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
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 index f8fee5d83..f0a6b30ea 100644 --- a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 @@ -3,6 +3,11 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} +# 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 %} |