From a1510870e86f9cde6537ac2cbbfb055337843c90 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 8 Apr 2022 12:38:13 +0200 Subject: drop infra_image_prefix We have one install_type only now so that infra stuff is not needed anymore. Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262 --- docker/hacluster/hacluster-base/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-corosync/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pacemaker/Dockerfile.j2 | 2 +- docker/hacluster/hacluster-pcs/Dockerfile.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/hacluster') 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 %} -- cgit v1.2.3