From 90adc2b851461828b5051be373640911c795fc5a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 7 Jul 2020 13:02:49 +0200 Subject: 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 --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/openvswitch') diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index e1d8a73f3..d0223c2bb 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ infra_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 b82a18d20..a0baf8c3c 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ infra_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 9246dffef..510f1ce07 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ infra_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 711bc99b2..88dc1c5fc 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -- cgit v1.2.3