diff options
| author | Mark Goddard <mark@stackhpc.com> | 2021-01-12 16:18:51 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2021-01-12 16:21:32 +0000 |
| commit | 93204ecfeca7ba394bd4c3872147357aa708f46e (patch) | |
| tree | 0d5c2c8a202be3129e70778f110af64d0af7024b /docker/monasca | |
| parent | e0faaaaefbf2ed8ddfd8265df29a819ac5949262 (diff) | |
| download | kolla-93204ecfeca7ba394bd4c3872147357aa708f46e.tar.gz kolla-93204ecfeca7ba394bd4c3872147357aa708f46e.zip | |
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
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 2c9200fba..554fd31f0 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -1,10 +1,8 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}storm:{{ tag }} +FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -USER root - {% block monasca_thresh_header %}{% endblock %} {% import "macros.j2" as macros with context %} |