From a1510870e86f9cde6537ac2cbbfb055337843c90 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 8 Apr 2022 12:38:13 +0200 Subject: [PATCH] drop infra_image_prefix We have one install_type only now so that infra stuff is not needed anymore. Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262 --- docker/cron/Dockerfile.j2 | 2 +- docker/dnsmasq/Dockerfile.j2 | 2 +- docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 2 +- docker/elasticsearch/elasticsearch/Dockerfile.j2 | 2 +- docker/etcd/Dockerfile.j2 | 2 +- docker/fluentd/Dockerfile.j2 | 2 +- docker/grafana/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-base/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-corosync/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pacemaker/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pcs/Dockerfile.j2 | 2 +- docker/haproxy/Dockerfile.j2 | 2 +- docker/influxdb/Dockerfile.j2 | 2 +- docker/iscsid/Dockerfile.j2 | 2 +- docker/kafka/Dockerfile.j2 | 2 +- docker/keepalived/Dockerfile.j2 | 2 +- docker/kibana/Dockerfile.j2 | 2 +- docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/logstash/Dockerfile.j2 | 2 +- docker/mariadb/mariadb-base/Dockerfile.j2 | 2 +- docker/mariadb/mariadb-clustercheck/Dockerfile.j2 | 2 +- docker/mariadb/mariadb-server/Dockerfile.j2 | 2 +- docker/memcached/Dockerfile.j2 | 2 +- docker/monasca/monasca-thresh/Dockerfile.j2 | 2 +- docker/multipathd/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/openstack-base/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 +- docker/ovn/ovn-base/Dockerfile.j2 | 2 +- docker/ovn/ovn-controller/Dockerfile.j2 | 2 +- docker/ovn/ovn-nb-db-server/Dockerfile.j2 | 2 +- docker/ovn/ovn-northd/Dockerfile.j2 | 2 +- docker/ovn/ovn-sb-db-server/Dockerfile.j2 | 2 +- docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 | 2 +- docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 | 2 +- docker/ovsdpdk/ovsdpdk/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-alertmanager/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-base/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-cadvisor/Dockerfile.j2 | 2 +- .../prometheus-elasticsearch-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 | 2 +- .../prometheus/prometheus-memcached-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-msteams/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-mtail/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-node-exporter/Dockerfile.j2 | 2 +- .../prometheus/prometheus-openstack-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-v2-server/Dockerfile.j2 | 2 +- docker/proxysql/Dockerfile.j2 | 2 +- docker/qdrouterd/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- docker/redis/redis-base/Dockerfile.j2 | 2 +- docker/redis/redis-sentinel/Dockerfile.j2 | 2 +- docker/redis/redis/Dockerfile.j2 | 2 +- docker/skydive/skydive-agent/Dockerfile.j2 | 2 +- docker/skydive/skydive-analyzer/Dockerfile.j2 | 2 +- docker/skydive/skydive-base/Dockerfile.j2 | 2 +- docker/storm/storm-base/Dockerfile.j2 | 2 +- docker/storm/storm/Dockerfile.j2 | 2 +- docker/telegraf/Dockerfile.j2 | 2 +- docker/tgtd/Dockerfile.j2 | 2 +- docker/zookeeper/Dockerfile.j2 | 2 +- kolla/image/build.py | 5 +---- 69 files changed, 69 insertions(+), 72 deletions(-) diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 1da4d40ea8..9acf99b815 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2 index 5a678dba2d..d7de0680f2 100644 --- a/docker/dnsmasq/Dockerfile.j2 +++ b/docker/dnsmasq/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 7106d87cf5..2cde977c1e 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2 index 5633ce6d32..88b67b1f7a 100644 --- a/docker/elasticsearch/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index 06b486c25e..956f803525 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 3351fcda42..c1bf7065bc 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index 916ce4f354..2f69e7672e 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2 index 8f4f56c9bb..6dfbc822e2 100644 --- a/docker/hacluster/hacluster-base/Dockerfile.j2 +++ b/docker/hacluster/hacluster-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/hacluster/hacluster-corosync/Dockerfile.j2 b/docker/hacluster/hacluster-corosync/Dockerfile.j2 index 859407bb4c..0544fb370d 100644 --- a/docker/hacluster/hacluster-corosync/Dockerfile.j2 +++ b/docker/hacluster/hacluster-corosync/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 index 6984269f5d..e778ed5307 100644 --- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 index bf01fee744..054b8d7428 100644 --- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2 index 3621c8fcfd..4486fa72fd 100644 --- a/docker/hacluster/hacluster-pcs/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pcs/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 41fd0b9750..db03f6be1b 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index 5304bfac48..1b817f2ad6 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/docker/influxdb/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 4e95d2ca88..71799e2293 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index 427376ac78..8376d72e1a 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 12d086b0f1..c2db99fe20 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 154080fadb..2ce1919033 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 2aa8aaed54..507271c394 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 0be662092f..ab6ddfc187 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index f8ff4f7137..808b5ecbc8 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/docker/mariadb/mariadb-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 index aa52f8f4a7..c21e1efe0c 100644 --- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 +++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block mariadb_clustercheck_header %}{% endblock %} diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2 index 01510dbe8b..1a25fc4c05 100644 --- a/docker/mariadb/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb/mariadb-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 4e7fb4238c..2995fecd5c 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index acf5a99421..415f6adb9c 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index 876eea8b1d..0b0baf21a7 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index db3a43885f..3324175ba6 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index afc724214c..6d79511b9f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1ddf669e9b..a2d7080140 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index a0baf8c3c1..b82a18d20e 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index 9981b5997e..39b0060ebb 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 88dc1c5fc5..711bc99b27 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2 index 99775bbccf..613b167653 100644 --- a/docker/ovn/ovn-base/Dockerfile.j2 +++ b/docker/ovn/ovn-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/docker/ovn/ovn-controller/Dockerfile.j2 index f3d4fd2c46..ef4d05ddcd 100644 --- a/docker/ovn/ovn-controller/Dockerfile.j2 +++ b/docker/ovn/ovn-controller/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 index c09884d78d..ecc94651bc 100644 --- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/docker/ovn/ovn-northd/Dockerfile.j2 index 0193cf7be0..2c94f2f204 100644 --- a/docker/ovn/ovn-northd/Dockerfile.j2 +++ b/docker/ovn/ovn-northd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 index 4caa866c42..9acd01fa30 100644 --- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 index 9f4b5ecf6e..af95922723 100644 --- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 index dd91dc17bd..f23e0b79d7 100644 --- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index 0f01621b99..0ea430e4fc 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 index a3f351b066..6a8efe7382 100644 --- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 +++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/docker/prometheus/prometheus-base/Dockerfile.j2 index add8df34db..3dbe0d0fd8 100644 --- a/docker/prometheus/prometheus-base/Dockerfile.j2 +++ b/docker/prometheus/prometheus-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index dddbe69d17..66a2b32ab2 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index d337d9aa25..48fe5d7ae9 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 index 801eca7d09..4bb3dea383 100644 --- a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 index ffa0fa6233..181fe695df 100644 --- a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 index bcdcc7a56c..84c8c7754b 100644 --- a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 index d01c400b2d..816d230d24 100644 --- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-msteams/Dockerfile.j2 b/docker/prometheus/prometheus-msteams/Dockerfile.j2 index 711532efee..a89f17bd12 100644 --- a/docker/prometheus/prometheus-msteams/Dockerfile.j2 +++ b/docker/prometheus/prometheus-msteams/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-mtail/Dockerfile.j2 b/docker/prometheus/prometheus-mtail/Dockerfile.j2 index 9b5243bd51..a80fccd2f4 100644 --- a/docker/prometheus/prometheus-mtail/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mtail/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 index 03d421928b..3faef1e075 100644 --- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 index 5694fe4872..308db8987e 100644 --- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 index 83e48be47f..0de85853b8 100644 --- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 b/docker/prometheus/prometheus-v2-server/Dockerfile.j2 index f0ae96211f..1bfe715ef9 100644 --- a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-v2-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/proxysql/Dockerfile.j2 b/docker/proxysql/Dockerfile.j2 index 4e8e3ca7cd..e5427669f4 100644 --- a/docker/proxysql/Dockerfile.j2 +++ b/docker/proxysql/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 5690559f25..d0d5bbb64b 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 0263184924..270cb96c70 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/redis/redis-base/Dockerfile.j2 b/docker/redis/redis-base/Dockerfile.j2 index c3a42dac8c..7f758d3fb7 100644 --- a/docker/redis/redis-base/Dockerfile.j2 +++ b/docker/redis/redis-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/redis/redis-sentinel/Dockerfile.j2 b/docker/redis/redis-sentinel/Dockerfile.j2 index 663621f78f..d98e687dbf 100644 --- a/docker/redis/redis-sentinel/Dockerfile.j2 +++ b/docker/redis/redis-sentinel/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/redis/redis/Dockerfile.j2 b/docker/redis/redis/Dockerfile.j2 index a9fbfb8a6a..6843a8d550 100644 --- a/docker/redis/redis/Dockerfile.j2 +++ b/docker/redis/redis/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2 index 50c966461a..72cf1b21fb 100644 --- a/docker/skydive/skydive-agent/Dockerfile.j2 +++ b/docker/skydive/skydive-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2 index 49a0fc182d..de265af517 100644 --- a/docker/skydive/skydive-analyzer/Dockerfile.j2 +++ b/docker/skydive/skydive-analyzer/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index 5342f7e99f..22c7f6c7e3 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/storm/storm-base/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 index bc89041df5..272f6a9db4 100644 --- a/docker/storm/storm-base/Dockerfile.j2 +++ b/docker/storm/storm-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/storm/storm/Dockerfile.j2 b/docker/storm/storm/Dockerfile.j2 index 610142a44a..dc61969ced 100644 --- a/docker/storm/storm/Dockerfile.j2 +++ b/docker/storm/storm/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index c8632a61c3..0a33824496 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index f3cf4ceabb..5b9348e304 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2 index 0c7a28ec32..f0a02d4339 100644 --- a/docker/zookeeper/Dockerfile.j2 +++ b/docker/zookeeper/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 208d763e5d..e5a7e757e2 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -647,7 +647,6 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache self.image_prefix = self.base + '-' + self.install_type + '-' - self.infra_image_prefix = self.image_prefix self.regex = conf.regex self.image_statuses_bad = dict() @@ -832,7 +831,6 @@ class KollaWorker(object): 'docker_healthchecks': self.docker_healthchecks, 'supported_distro_name': supported_distro_name, 'image_prefix': self.image_prefix, - 'infra_image_prefix': self.infra_image_prefix, 'install_type': self.install_type, 'namespace': self.namespace, 'openstack_release': self.openstack_release, @@ -1256,8 +1254,7 @@ class KollaWorker(object): for parent_name, parent in sort_images.items(): for image in sort_images.values(): - if (image.parent_name == parent_name or image.parent_name == - parent_name.replace(self.install_type, 'infra')): + if (image.parent_name == parent_name): parent.children.append(image) image.parent = parent