diff options
| author | Mark Goddard <mark@stackhpc.com> | 2021-01-12 16:18:51 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-01-23 08:52:34 +0000 |
| commit | 890d199e98dcc0edaf0ccc5ac8a0c479d3209efc (patch) | |
| tree | 52b673bae0e6ed2a23a2ed7cc88102dda3ad9a06 /docker | |
| parent | 36126c08255fcf8a201167b5d63f23f6bfdeceec (diff) | |
| download | kolla-890d199e98dcc0edaf0ccc5ac8a0c479d3209efc.tar.gz kolla-890d199e98dcc0edaf0ccc5ac8a0c479d3209efc.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
(cherry picked from commit 93204ecfeca7ba394bd4c3872147357aa708f46e)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/storm/storm-base/Dockerfile.j2 (renamed from docker/storm/Dockerfile.j2) | 7 | ||||
| -rw-r--r-- | docker/storm/storm-base/extend_start.sh (renamed from docker/storm/extend_start.sh) | 0 | ||||
| -rw-r--r-- | docker/storm/storm/Dockerfile.j2 | 13 |
4 files changed, 16 insertions, 8 deletions
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 %} diff --git a/docker/storm/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 index 51552926c..e4a3c6bb1 100644 --- a/docker/storm/Dockerfile.j2 +++ b/docker/storm/storm-base/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% block storm %}{% endblock %} +{% block storm_base_header %}{% endblock %} {% import "macros.j2" as macros with context %} @@ -50,7 +50,4 @@ ENV PYTHON={{ '/usr/bin/python' ~ distro_python_version }} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -{% block storm_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER storm +{% block storm_base_footer %}{% endblock %} diff --git a/docker/storm/extend_start.sh b/docker/storm/storm-base/extend_start.sh index 6c9bb0b62..6c9bb0b62 100644 --- a/docker/storm/extend_start.sh +++ b/docker/storm/storm-base/extend_start.sh diff --git a/docker/storm/storm/Dockerfile.j2 b/docker/storm/storm/Dockerfile.j2 new file mode 100644 index 000000000..dc61969ce --- /dev/null +++ b/docker/storm/storm/Dockerfile.j2 @@ -0,0 +1,13 @@ +FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% block storm_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% block storm_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER storm |