Merge "Remove footer block from intermediate images" into stable/train
This commit is contained in:
commit
5a5fe69114
|
@ -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
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
|
||||||
|
|
||||||
{% block cyborg_footer %}{% endblock %}
|
{% block cyborg_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
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 %}
|
{% block neutron_infoblox_ipam_agent_header %}{% endblock %}
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
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
|
USER root
|
||||||
|
|
||||||
{% block neutron_server_opendaylight_header %}{% endblock %}
|
{% block neutron_server_opendaylight_header %}{% endblock %}
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
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
|
USER root
|
||||||
|
|
||||||
{% block neutron_server_ovn %}{% endblock %}
|
{% block neutron_server_ovn %}{% endblock %}
|
||||||
|
|
|
@ -32,4 +32,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
||||||
|
|
||||||
{% block ovsdpdk_footer %}{% endblock %}
|
{% block ovsdpdk_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
|
||||||
|
|
|
@ -12,4 +12,3 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% block rsyslog_base_footer %}{% endblock %}
|
{% block rsyslog_base_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
|
||||||
|
|
|
@ -27,4 +27,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
||||||
|
|
||||||
{% block skydive_base_footer %}{% endblock %}
|
{% block skydive_base_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
|
||||||
|
|
Loading…
Reference in New Issue