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/storm/storm-base/Dockerfile.j2 | 2 +- docker/storm/storm/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/storm') diff --git a/docker/storm/storm-base/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 index bc89041df..272f6a9db 100644 --- a/docker/storm/storm-base/Dockerfile.j2 +++ b/docker/storm/storm-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/storm/storm/Dockerfile.j2 b/docker/storm/storm/Dockerfile.j2 index 610142a44..dc61969ce 100644 --- a/docker/storm/storm/Dockerfile.j2 +++ b/docker/storm/storm/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -- cgit v1.2.3