diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-07-07 13:02:49 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-07-09 23:31:42 +0200 |
| commit | 90adc2b851461828b5051be373640911c795fc5a (patch) | |
| tree | fa63340e20fc40e6137b025c04f59ae85e18a670 /docker/openvswitch | |
| parent | 198986c51fcefef7da5c76f89400101084452ebb (diff) | |
| download | kolla-90adc2b851461828b5051be373640911c795fc5a.tar.gz kolla-90adc2b851461828b5051be373640911c795fc5a.zip | |
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
Diffstat (limited to 'docker/openvswitch')
4 files changed, 4 insertions, 4 deletions
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 %} |