introduce 'infra_image_prefix' for infra images
Defaults to 'image_prefix' for now but shows which images gets their names changed soon. Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
This commit is contained in:
parent
198986c51f
commit
90adc2b851
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
|
|
||||||
{% block mariadb_clustercheck_header %}{% endblock %}
|
{% block mariadb_clustercheck_header %}{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}storm:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}rsyslog-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}rsyslog-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
|
||||||
{% block labels %}
|
{% block labels %}
|
||||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -752,6 +752,7 @@ class KollaWorker(object):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
self.image_prefix = self.base + '-' + self.install_type + '-'
|
self.image_prefix = self.base + '-' + self.install_type + '-'
|
||||||
|
self.infra_image_prefix = self.image_prefix
|
||||||
|
|
||||||
self.regex = conf.regex
|
self.regex = conf.regex
|
||||||
self.image_statuses_bad = dict()
|
self.image_statuses_bad = dict()
|
||||||
|
@ -934,6 +935,7 @@ class KollaWorker(object):
|
||||||
'supported_distro_release': supported_distro_release,
|
'supported_distro_release': supported_distro_release,
|
||||||
'install_metatype': self.install_metatype,
|
'install_metatype': self.install_metatype,
|
||||||
'image_prefix': self.image_prefix,
|
'image_prefix': self.image_prefix,
|
||||||
|
'infra_image_prefix': self.infra_image_prefix,
|
||||||
'install_type': self.install_type,
|
'install_type': self.install_type,
|
||||||
'namespace': self.namespace,
|
'namespace': self.namespace,
|
||||||
'openstack_release': self.openstack_release,
|
'openstack_release': self.openstack_release,
|
||||||
|
|
Loading…
Reference in New Issue