Browse Source

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 4b792b9a43)
changes/86/770086/2
Mark Goddard 2 years ago
parent
commit
a11b99c85d
  1. 1
      docker/cyborg/cyborg-base/Dockerfile.j2
  2. 1
      docker/mariadb/mariadb-base/Dockerfile.j2
  3. 5
      docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
  4. 5
      docker/neutron/neutron-server-ovn/Dockerfile.j2
  5. 1
      docker/ovsdpdk/ovsdpdk/Dockerfile.j2
  6. 1
      docker/rsyslog/rsyslog-base/Dockerfile.j2
  7. 1
      docker/skydive/skydive-base/Dockerfile.j2

1
docker/cyborg/cyborg-base/Dockerfile.j2

@ -37,4 +37,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 %}

1
docker/mariadb/mariadb-base/Dockerfile.j2

@ -25,4 +25,3 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(mariadb_base_packages | customizable("packages")) }}
{% block mariadb_base_footer %}{% endblock %}
{% block footer %}{% endblock %}

5
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 %}

5
docker/neutron/neutron-server-ovn/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_server_ovn %}{% endblock %}
{% import "macros.j2" as macros with context %}

1
docker/ovsdpdk/ovsdpdk/Dockerfile.j2

@ -34,4 +34,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 %}

1
docker/rsyslog/rsyslog-base/Dockerfile.j2

@ -14,4 +14,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 %}

1
docker/skydive/skydive-base/Dockerfile.j2

@ -25,4 +25,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 %}

Loading…
Cancel
Save