diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-23 13:07:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-23 13:07:17 +0000 |
| commit | 50265b3c7d2868ad57bb007951fd04d2ec09f16a (patch) | |
| tree | e7115242660d4dae6577ffe03367d169a604fc14 | |
| parent | 5a5fe69114ec2cb0b60a7c1ed9f3a11b583c3664 (diff) | |
| parent | 890d199e98dcc0edaf0ccc5ac8a0c479d3209efc (diff) | |
| download | kolla-50265b3c7d2868ad57bb007951fd04d2ec09f16a.tar.gz kolla-50265b3c7d2868ad57bb007951fd04d2ec09f16a.zip | |
Merge "Add a storm-base image" into stable/train
| -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 |