From 890d199e98dcc0edaf0ccc5ac8a0c479d3209efc Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 12 Jan 2021 16:18:51 +0000 Subject: Add a storm-base image Refactor storm image dependencies. Previously we had: base -> storm -> monasca-thresh Both storm and monasca-thresh images are final, and each includes a footer. This causes issues when the footer expects to be at the end of the image, or there to be only a single footer. In particular, since I2592a736206eaec811290e9fbdbf2540c0518ffe, the footer used in CI jobs reverts to the public package mirrors. This change introduces a storm-base image, and refactors the dependency chain: base -> storm-base -> storm base -> storm-base -> monasca-thresh Related-Bug: #1902101 Change-Id: I53e8ba8d4baa4434cf3c49ed94d1f7cb44099bee (cherry picked from commit 93204ecfeca7ba394bd4c3872147357aa708f46e) --- docker/monasca/monasca-thresh/Dockerfile.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/monasca') diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index f76ef50e0..cc8f7a6ad 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -1,8 +1,6 @@ -FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -USER root - {% block monasca_thresh_header %}{% endblock %} {% import "macros.j2" as macros with context %} -- cgit v1.2.3