diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-12-05 15:10:50 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2022-12-06 12:58:10 +0000 |
| commit | 52a53927f5d390886c3940e364fe9fa888e3bc98 (patch) | |
| tree | 6bab585ca2d89349bba013618f8dba299a6a39ed /docker/storm | |
| parent | 3043491b0fd6b59b5b76430819d2149da5d254f3 (diff) | |
| download | kolla-52a53927f5d390886c3940e364fe9fa888e3bc98.tar.gz kolla-52a53927f5d390886c3940e364fe9fa888e3bc98.zip | |
Remove monasca, kafka, storm and zookeeper.
Monasca, kafka, storm and zookeeper have been removed in kolla-ansible [1],[2].
[1]: https://review.opendev.org/c/openstack/kolla-ansible/+/861392
[2]: https://review.opendev.org/c/openstack/kolla-ansible/+/865029
Change-Id: I0958a9353bc4585c4f65a1d316328a0e80b0b8b7
Diffstat (limited to 'docker/storm')
| -rw-r--r-- | docker/storm/storm-base/Dockerfile.j2 | 58 | ||||
| -rw-r--r-- | docker/storm/storm-base/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/storm/storm/Dockerfile.j2 | 13 |
3 files changed, 0 insertions, 80 deletions
diff --git a/docker/storm/storm-base/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 deleted file mode 100644 index 706b8fd06..000000000 --- a/docker/storm/storm-base/Dockerfile.j2 +++ /dev/null @@ -1,58 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block storm_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='storm', homedir='/opt/storm') }} - -{% if base_package_type == 'rpm' %} - {% set storm_packages = [ - 'java-1.8.0-openjdk-headless', - 'zip', - ] %} -{% elif base_package_type == 'deb' %} - - {% if base_distro == 'debian' %} - {% set java_version = '11' %} - {% elif base_distro == 'ubuntu' %} - {% set java_version = '8' %} - {% endif %} - - {% set storm_packages = [ - 'openjdk-' + java_version + '-jre-headless', - 'zip', - ] %} -{% endif %} - -{{ macros.install_packages(storm_packages | customizable("packages")) }} - -{% block storm_version %} -ARG storm_version=1.2.2 -ARG storm_url=https://archive.apache.org/dist/storm/apache-storm-${storm_version}/apache-storm-${storm_version}.tar.gz -ARG storm_pkg_sha512sum=0a1120b8df7b22edc75f0a412d625841f72f3fb8e9ff5d413d510908d68ea1f0c17d68c1a7f1eda427b40902452e9efcae902c36499b558592e41cc1079de2e0 -{% endblock %} - -{% block storm_install %} -RUN curl -o /tmp/storm.tgz ${storm_url} \ - && echo "${storm_pkg_sha512sum} /tmp/storm.tgz" | sha512sum -c \ - && tar --strip 1 -xvf /tmp/storm.tgz -C /opt/storm \ - && rm -f /tmp/storm.tgz - -# Mitigation for CVE-2021-44228 and CVE-2021-45046: remove the JndiLookup class -# from the classpath -RUN zip -q -d /opt/storm/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class -{% endblock %} - -{% block storm_python_version %} -# NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives -ENV PYTHON='/usr/bin/python3' -{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start - -{% block storm_base_footer %}{% endblock %} diff --git a/docker/storm/storm-base/extend_start.sh b/docker/storm/storm-base/extend_start.sh deleted file mode 100644 index 6c9bb0b62..000000000 --- a/docker/storm/storm-base/extend_start.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Create log directory, with appropriate permissions -if [[ ! -d "/var/log/kolla/storm" ]]; then - mkdir -p /var/log/kolla/storm -fi -if [[ $(stat -c %a /var/log/kolla/storm) != "755" ]]; then - chmod 755 /var/log/kolla/storm -fi diff --git a/docker/storm/storm/Dockerfile.j2 b/docker/storm/storm/Dockerfile.j2 deleted file mode 100644 index dc61969ce..000000000 --- a/docker/storm/storm/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -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 |
