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 /docker/cyborg | |
| 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)
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 1 |
1 files changed, 0 insertions, 1 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 %} |
