diff options
130 files changed, 2 insertions, 143 deletions
diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst index 76f6c96ae..504d9b12a 100644 --- a/doc/CONTRIBUTING.rst +++ b/doc/CONTRIBUTING.rst @@ -82,11 +82,7 @@ is as follows:: {% block << service >>_footer %}{% endblock %} {% block footer %}{% endblock %} - {{ include_footer }} .. NOTE:: The generic footer block ``{% block footer %}{% endblock %}`` should not be included in base images (e.g. glance-base). - - {{ include_footer }} is legacy and should not be included in new services, it - is superseded by {% block footer %}{% endblock %} diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 370b77286..639e9a40f 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -19,4 +19,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start {% block aodh_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 4fa319ce8..c1d896062 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_evaluator_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index c43af18c7..476b49b2f 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_expirer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 45b41a3ad..66621f960 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_listener_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 7e1fbadc1..8eca81974 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_notifier_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b7816197b..069567cf6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -14,7 +14,6 @@ LABEL kolla_version="{{ kolla_version }}" {% import "macros.j2" as macros with context %} {% block base_header %}{% endblock %} -{{ include_header }} ENV KOLLA_BASE_DISTRO {{ base_distro }} ENV KOLLA_INSTALL_TYPE {{ install_type }} diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index 1f8897eb2..1ba27ee0e 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -58,4 +58,3 @@ CMD [ "/sbin/init" ] {% block bifrost_deploy_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index dbe6c264e..885155e74 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -63,4 +63,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start {% block ceilometer_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 3d3d4e921..4b3563ad6 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_central_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index c2e67bbc5..aaa08169d 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_collector_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 76298e062..6c793b490 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -38,7 +38,6 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% block ceilometer_compute_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} # NOTE(huikang): non-root user does not work with libvirt.sock. # Need configuration in nova-libvirt container to allow diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 6d351391b..891149739 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index 0627eff00..06ff6bfd4 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -10,4 +10,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/bin/fetch_ceph_keys.py {% block ceph_mon_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 3f38fd016..a521189df 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block ceph_osd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index 721bd8f05..156ba4956 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -5,4 +5,3 @@ MAINTAINER {{ maintainer }} {% block ceph_rgw_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index d845b5001..13b059020 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -16,4 +16,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block chrony_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index cbedd9fd4..eaef8f81a 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -55,6 +55,5 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start {% block cinder_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 02a30c493..778482144 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -42,6 +42,5 @@ MAINTAINER {{ maintainer }} {% block cinder_backup_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index b19cb8359..da3a4a4b8 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block cinder_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index ef90fcd91..3472a64af 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -53,6 +53,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block cinder_volume_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 1e0ff7896..7a0728f7e 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -28,6 +28,5 @@ RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start {% block cloudkitty_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cloudkitty diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 768c406e5..d77446a5f 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -25,6 +25,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block cloudkitty_processor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cloudkitty diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index ac162d8cf..d22bea01a 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -20,6 +20,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block collectd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER collectd diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 index 4a47d6b94..eb1d35493 100644 --- a/docker/congress/congress-api/Dockerfile.j2 +++ b/docker/congress/congress-api/Dockerfile.j2 @@ -8,6 +8,5 @@ RUN chmod 755 /usr/local/bin/kolla_congress_extend_start {% block congress_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER congress diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 index f807ddb69..61f144e00 100644 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ b/docker/congress/congress-datasource/Dockerfile.j2 @@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }} {% block congress_datasource_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER congress diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 index 88de85571..74d9ce11d 100644 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ b/docker/congress/congress-policy-engine/Dockerfile.j2 @@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }} {% block congress_policy_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER congress diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index a2cf93ecd..7fe5212bf 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -24,4 +24,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block cron_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 476b449ad..da3ae5e7c 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -27,4 +27,4 @@ COPY start.sh /usr/local/bin/kolla_start RUN chmod 755 /usr/local/bin/kolla_start {% block dind_footer %}{% endblock %} -{{ include_footer }} +{% block footer %}{% endblock %} diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index df1722290..dd7aa4d0f 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -40,6 +40,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block elasticsearch_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER elasticsearch diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index 5bd7cc1c8..f91a976e0 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block etcd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER etcd diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 405e10c5f..30c9f5771 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -48,6 +48,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ {% block fluentd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER td-agent diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 88c1c77b2..1eab11b02 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -44,4 +44,3 @@ RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start {% block freezer_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 352853694..4ef6edbfc 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -18,6 +18,5 @@ RUN chmod 755 /usr/local/bin/kolla_glance_extend_start {% block glance_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER glance diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index 2f214f853..a5e217e96 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }} {% block glance_registry_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER glance diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index edee1bc7f..f42d27369 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -23,4 +23,3 @@ RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start {% block gnocchi_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 7ef3955ce..365edf370 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block gnocchi_metricd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER gnocchi diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 20ab2135b..399cc9535 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -15,6 +15,4 @@ MAINTAINER {{ maintainer }} {% block gnocchi_statsd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER gnocchi diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index 694e50c89..cfaefbd37 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -22,6 +22,5 @@ RUN grafana-cli plugins install sileht-gnocchi-datasource \ {% block grafana_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER grafana diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 964e0e663..a3a7a0b25 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -25,4 +25,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config {% block haproxy_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0654edbfa..71ad40e8e 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }} {% block heat_api_cfn_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index d7486cc7b..4ed685f53 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start {% block heat_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 48b600695..98339e0e5 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -21,6 +21,4 @@ MAINTAINER {{ maintainer }} {% block heat_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER heat diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index 1756849fb..8d271a9e7 100644 --- a/docker/heka/Dockerfile.j2 +++ b/docker/heka/Dockerfile.j2 @@ -34,6 +34,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_heka_sudoers \ {% block heka_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heka diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index c94d2753b..194c2c7e0 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -128,4 +128,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block horizon_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index 55cc56021..649867a29 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/docker/influxdb/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block influxdb_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER influxdb diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 1fd82dcfa..9ff62d23b 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index f97e0e475..5841c3901 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -78,6 +78,5 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% block ironic_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 3eae4dab3..d659eb7ff 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -43,6 +43,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block ironic_inspector_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index accfeaff2..7540b536a 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -33,4 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_pxe_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 0f29fe5f3..e1978b53c 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block iscsid_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 index d8bbe7818..9be12b521 100644 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ b/docker/karbor/karbor-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start {% block karbor_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 index 745fcd4a8..99beb28ae 100644 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ b/docker/karbor/karbor-operationengine/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block karbor_operationengine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 index 9be5cca0b..28ddf5f4c 100644 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ b/docker/karbor/karbor-protection/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block karbor_protection_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 2c3ad15f8..f7dc8a62d 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh {% block keepalived_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 6710490c4..2f72d4e42 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -27,4 +27,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo {% block keystone_fernet_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 3848e801d..51314cdc8 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block keystone_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 5a835a9f6..18b549fb5 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -13,4 +13,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo {% block keystone_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index c95b5068c..d6cfddd0a 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block kibana_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER kibana diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 5c5fa738f..8f348cbfa 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -76,6 +76,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers {% block kolla_toolbox_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ansible diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 0fd631d2e..1609530bf 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -18,4 +18,3 @@ RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/re {% block kubetoolbox_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 7f64cf4da..1d9da6002 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -18,4 +18,3 @@ RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \ {% block kuryr_libnetwork_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index a09c057cb..4862b6ebb 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start {% block magnum_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER magnum diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 080ef693b..6e065ec8c 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -27,6 +27,5 @@ RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-re {% block magnum_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER magnum diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 70908d82c..c2b210a31 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -22,6 +22,5 @@ RUN chmod 755 /usr/local/bin/kolla_manila_extend_start {% block manila_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 4cdeba325..46cae63f1 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -40,6 +40,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block manila_data_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 56ee3ad3f..28b62b141 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block manila_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 42e8d1d53..d0a99ffd3 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block manila_share_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 9482e07b7..d45085456 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -41,6 +41,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block mariadb_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER mysql diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 518986f7c..55a003529 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -12,6 +12,5 @@ MAINTAINER {{ maintainer }} {% block memcached_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER memcached diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 579f005dc..b393cffdc 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start {% block mistral_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER mistral diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 458ff881e..a054d128b 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 382d0e33c..ac68130ae 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_executor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index 6a078fb23..4a8d2e362 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/docker/mongodb/Dockerfile.j2 @@ -29,6 +29,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block mongodb_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER mongodb diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index 391008e11..d87da215c 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -15,4 +15,3 @@ MAINTAINER {{ maintainer }} {% block multipathd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 2a71f98cf..cee22cd75 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_murano_extend_start {% block murano_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER murano diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 846a6e4be..80e73ce3d 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block murano_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER murano diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 497f22002..c49919238 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block neutron_dhcp_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index 322d0817a..96f2a0eca 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block neutron_l3_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index 904671231..b84b498e7 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 @@ -45,6 +45,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_lbaas_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 010c312d0..5f894d26c 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -35,6 +35,5 @@ MAINTAINER {{ maintainer }} {% block neutron_linuxbridge_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 87269f58f..97685abf6 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -25,6 +25,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ {% block neutron_metadata_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index b0133aaf6..dcdf8f240 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }} {% block neutron_metering_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index d41f71a8b..1a3c52875 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }} {% block neutron_openvswitch_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 1fee58600..dd6d03bf3 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -35,6 +35,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ {% block neutron_server_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index a2daf90d0..cdd0b555c 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_sfc_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 index f60c096a2..c995cee0e 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -46,7 +46,6 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_vpnaas_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} # TODO(pbourke): The libreswan driver required by redhat derived bases # currently requires root in Neutron. Remove this if condition once diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 7c8436fd0..0e9eeb124 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -53,6 +53,5 @@ RUN chmod 755 /usr/local/bin/kolla_nova_extend_start {% block nova_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 1fd22cef8..65fe986f9 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -29,6 +29,5 @@ RUN rm /etc/nova/nova-compute.conf {% block nova_compute_ironic_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 3962ad046..0304c7954 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -96,6 +96,5 @@ ENV PATH $PATH:/lib/udev {% block nova_compute_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index ebb61a67a..95d56b394 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }} {% block nova_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index e5a8ad5c4..d87009a26 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }} {% block nova_consoleauth_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 813b97128..079711a05 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -64,4 +64,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block nova_libvirt_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 19a861458..aa8a5dde5 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -33,6 +33,5 @@ MAINTAINER {{ maintainer }} {% block nova_novncproxy_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index edd49883c..c17c46fd4 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }} {% block nova_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index 025a888a1..1d29b3165 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -22,6 +22,5 @@ MAINTAINER {{ maintainer }} {% block nova_serialproxy_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 913d33e45..edd014dfa 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -45,6 +45,5 @@ MAINTAINER {{ maintainer }} {% block nova_spicehtml5proxy_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER nova diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 3b4ded412..98bee70f1 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block nova_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index cf85de2bd..1b23732d6 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -12,4 +12,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured \ {% block openvswitch_db_server_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index ef7a5e6ed..19535d0b1 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start {% block openvswitch_vswitchd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index 0ef0de233..090a2e9bb 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -22,4 +22,3 @@ RUN chmod 755 /usr/local/bin/kolla_panko_extend_start {% block panko_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 764ffbab2..4c7ff02a2 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -61,6 +61,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gosp && chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers {% block rabbitmq_footer %}{% endblock %} -{{ include_footer }} +{% block footer %}{% endblock %} USER rabbitmq diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 04a14a741..e1872829d 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -30,6 +30,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block rally_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER rally diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 91937f9d8..02dd7e8e8 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start {% block sahara_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER sahara diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index d91b0b73a..84b8b9a36 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block sahara_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER sahara diff --git a/docker/searchlight/searchlight-api/Dockerfile.j2 b/docker/searchlight/searchlight-api/Dockerfile.j2 index 1f4797e03..d07c0d1d6 100644 --- a/docker/searchlight/searchlight-api/Dockerfile.j2 +++ b/docker/searchlight/searchlight-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_searchlight_extend_start {% block searchlight_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER searchlight diff --git a/docker/searchlight/searchlight-listener/Dockerfile.j2 b/docker/searchlight/searchlight-listener/Dockerfile.j2 index ddba8713b..8487efb40 100644 --- a/docker/searchlight/searchlight-listener/Dockerfile.j2 +++ b/docker/searchlight/searchlight-listener/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block searchlight_listener_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER searchlight diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index e556b4086..a6ac97ba5 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start {% block senlin_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER senlin diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 625796d07..7a3307d69 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block senlin_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER senlin diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 2a5de0e66..16e8c61c6 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_solum_extend_start {% block solum_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index a2c69ea0f..03f8a3819 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index 44cb8ada4..782f2563d 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_deployer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 509c03058..6ac2f9b32 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_worker_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index f69a7317b..153555cc3 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_account_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index 8bc64b9ec..d1b038f5e 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_container_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 4ee5c8ec5..f16871648 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }} {% block swift_object_expirer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 60bcc675f..ee7ff2346 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_object_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index d777a10cd..430fd4f5d 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_proxy_server_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index a34a646e8..d43efa177 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -17,6 +17,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block swift_rsyncd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index d6f30d718..ba3df8c95 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block telegraf_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER telegraf diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index dbfb0aa9c..2f3a53817 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -39,4 +39,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block tempest_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index d1e37d53f..284b5c61d 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -21,4 +21,3 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% block tgtd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 5ac79271a..c3dd29a00 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_trove_extend_start {% block trove_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 0941fae5f..a8a187acf 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index bcbe9aa5a..c5c5f8cad 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_guestagent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index f59426646..4d2002842 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_taskmanager_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index ffd3dfd5d..c86f6e175 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -24,6 +24,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block vmtp_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER vmtp diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index a133b380d..d8e518116 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start {% block watcher_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER watcher diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index 364ab2abc..e9a789526 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }} {% block watcher_applier_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER watcher diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index 3aad9ea59..5b8e374ac 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }} {% block watcher_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER watcher |