diff options
69 files changed, 69 insertions, 72 deletions
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 1da4d40ea..9acf99b81 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 5a678dba2..d7de0680f 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 7106d87cf..2cde977c1 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 5633ce6d3..88b67b1f7 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 06b486c25..956f80352 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 3351fcda4..c1bf7065b 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 916ce4f35..2f69e7672 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 8f4f56c9b..6dfbc822e 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 859407bb4..0544fb370 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 6984269f5..e778ed530 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 bf01fee74..054b8d742 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 3621c8fcf..4486fa72f 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 41fd0b975..db03f6be1 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 5304bfac4..1b817f2ad 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 4e95d2ca8..71799e229 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 427376ac7..8376d72e1 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 12d086b0f..c2db99fe2 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 154080fad..2ce191903 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 2aa8aaed5..507271c39 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 0be662092..ab6ddfc18 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 f8ff4f713..808b5ecbc 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 aa52f8f4a..c21e1efe0 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 01510dbe8..1a25fc4c0 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 4e7fb4238..2995fecd5 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 acf5a9942..415f6adb9 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 876eea8b1..0b0baf21a 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 db3a43885..3324175ba 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 afc724214..6d79511b9 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 1ddf669e9..a2d708014 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 a0baf8c3c..b82a18d20 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 9981b5997..39b0060eb 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 88dc1c5fc..711bc99b2 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 99775bbcc..613b16765 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 f3d4fd2c4..ef4d05ddc 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 c09884d78..ecc94651b 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 0193cf7be..2c94f2f20 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 4caa866c4..9acd01fa3 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 9f4b5ecf6..af9592272 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 dd91dc17b..f23e0b79d 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 0f01621b9..0ea430e4f 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 a3f351b06..6a8efe738 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 add8df34d..3dbe0d0fd 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 dddbe69d1..66a2b32ab 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 d337d9aa2..48fe5d7ae 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 801eca7d0..4bb3dea38 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 ffa0fa623..181fe695d 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 bcdcc7a56..84c8c7754 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 d01c400b2..816d230d2 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 711532efe..a89f17bd1 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 9b5243bd5..a80fccd2f 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 03d421928..3faef1e07 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 5694fe487..308db8987 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 83e48be47..0de85853b 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 f0ae96211..1bfe715ef 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 4e8e3ca7c..e5427669f 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 5690559f2..d0d5bbb64 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 026318492..270cb96c7 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 c3a42dac8..7f758d3fb 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 663621f78..d98e687db 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 a9fbfb8a6..6843a8d55 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 50c966461..72cf1b21f 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 49a0fc182..de265af51 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 5342f7e99..22c7f6c7e 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 bc89041df..272f6a9db 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 610142a44..dc61969ce 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 c8632a61c..0a3382449 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 f3cf4ceab..5b9348e30 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 0c7a28ec3..f0a02d433 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 4586346e2..a93661f6e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -646,7 +646,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() @@ -831,7 +830,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, @@ -1255,8 +1253,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 |