diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-12 21:21:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-12 21:21:07 +0000 |
| commit | 9707694c3448ae91d83f48e697077be7a6e4e519 (patch) | |
| tree | 9955a9cc539c2ae7d9abd1bb3e7960394e03c36c | |
| parent | d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b (diff) | |
| parent | 4b792b9a43bee3bfb499cea14924527550f2bce0 (diff) | |
| download | kolla-9707694c3448ae91d83f48e697077be7a6e4e519.tar.gz kolla-9707694c3448ae91d83f48e697077be7a6e4e519.zip | |
Merge "Remove footer block from intermediate images"
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 | 5 | ||||
| -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 |
6 files changed, 5 insertions, 5 deletions
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 51d39fd0f..9d60c7ab1 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/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 %} diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index 26f024599..bf7428191 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/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 %} 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 %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index 45bb2435c..b125bd876 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/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 %} diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2 index 54dadd7a8..6689e86f8 100644 --- a/docker/rsyslog/rsyslog-base/Dockerfile.j2 +++ b/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 %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index 31e157841..b75efd7a4 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/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 %} |