diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:21:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:21:57 +0000 |
| commit | 26fd382f176adbc104850f565df238253d8f9fc7 (patch) | |
| tree | cb95f603667c6bc52f47cfe9612d0c28b0cf2ef1 /docker/hacluster | |
| parent | 24c4da0218714ccc67c8b60b74eb37a414a70516 (diff) | |
| parent | a1510870e86f9cde6537ac2cbbfb055337843c90 (diff) | |
| download | kolla-26fd382f176adbc104850f565df238253d8f9fc7.tar.gz kolla-26fd382f176adbc104850f565df238253d8f9fc7.zip | |
Merge "drop infra_image_prefix"
Diffstat (limited to 'docker/hacluster')
5 files changed, 5 insertions, 5 deletions
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 %} |
