From d8420f5ec072b488c7fbcc5cff72e864c731de37 Mon Sep 17 00:00:00 2001
From: bandorf <Matthias.Bandorf@est.fujitsu.com>
Date: Tue, 2 Mar 2021 16:39:14 +0100
Subject: [PATCH] switch to storm version 1.2.3

Story: 2008674
Task: 41966
Change-Id: I71db8da82e3bbb6328e71cba6017182542d75fc9
---
 docker/Dockerfile     | 28 +++++++++++++++++++---------
 docker/mysql_check.py |  4 +++-
 docker/start.sh       |  4 ++--
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0a548c1..1596a7d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,10 +5,11 @@ ARG APP_REPO=https://review.opendev.org/openstack/monasca-thresh
 ARG REPO_VERSION=master
 ARG CONSTRAINTS_BRANCH=master
 
-FROM storm:1.1.1
+FROM storm:1.2.3
 
 ENV \
     MAVEN_HOME="/usr/share/maven" \
+    JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" \
     ZOOKEEPER_SERVERS="zookeeper" \
     ZOOKEEPER_PORT="2181" \
     ZOOKEEPER_WAIT="true" \
@@ -59,14 +60,21 @@ ARG COMMON_REPO
 ARG COMMON_VERSION
 ARG COMMON_GIT_COMMIT
 
-SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
+
 RUN \
-    echo 'http://dl-cdn.alpinelinux.org/alpine/v3.8/main' > /etc/apk/repositories && \
-    echo 'http://dl-cdn.alpinelinux.org/alpine/v3.8/community' | tee -a /etc/apk/repositories && \
-    apk upgrade --purge && \
-    apk add --no-cache --virtual build-dep maven git py3-pip python3-dev git openjdk8 make g++ && \
-    apk add --no-cache python3 mysql-client && \
+    mkdir -p /usr/share/man/man1 && \
+    apt-get clean && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends iproute2 net-tools netcat unzip software-properties-common && \
+    apt-add-repository -y 'deb http://ftp.de.debian.org/debian sid main' && \
+    apt-add-repository -y 'deb http://security.debian.org/debian-security stretch/updates main' && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends openjdk-8-jdk -o APT::Immediate-Configure=0 && \
+    apt-get install -y --no-install-recommends maven git python3-pip && \
+    apt-get install -y --no-install-recommends python3 default-mysql-client && \
     mkdir /root/.m2 && \
+    pip3 install --no-cache-dir --upgrade setuptools && \
     pip3 install --no-cache-dir \
         jinja2 \
         pykafka \
@@ -103,14 +111,16 @@ RUN \
         "$COMMON_GIT_COMMIT" >> /VERSIONS && \
     printf "Constraints file: %s\\n" \
         "$CONSTRAINTS_FILE"?h="$CONSTRAINTS_BRANCH" >> /VERSIONS && \
-    apk del build-dep && \
+    apt-get remove -y apt-utils && \
+    apt-get remove -y maven git python3-pip software-properties-common && \
+    apt-get -y autoremove && \
     rm -rf \
         /app \
         /monasca-common \
         /root/.cache/ \
         /root/.m2/repository  \
         /tmp/* \
-        /var/cache/apk/* \
+        /var/cache/apt/* \
         /var/log/*
 
 ENTRYPOINT ["/start.sh"]
diff --git a/docker/mysql_check.py b/docker/mysql_check.py
index bf0f6f0..812f107 100644
--- a/docker/mysql_check.py
+++ b/docker/mysql_check.py
@@ -55,7 +55,9 @@ if sys.version_info.major != 3:
     sys.stdout.write("Sorry, requires Python 3.x\n")
     sys.exit(1)
 
-LOG_LEVEL = logging.getLevelName(os.environ.get('LOG_LEVEL', 'INFO'))
+logLevelEnv = os.environ.get('LOG_LEVEL', 'INFO')
+LOG_LEVEL = logging.getLevelName(logLevelEnv.upper())
+
 logging.basicConfig(level=LOG_LEVEL)
 
 logger = logging.getLogger(__name__)
diff --git a/docker/start.sh b/docker/start.sh
index 37bcd72..f3b596a 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/sh
 # shellcheck shell=dash
 
 if [ -n "$DEBUG" ]; then
@@ -9,7 +9,7 @@ CONFIG_TEMPLATES="/templates"
 CONFIG_DEST="/etc/monasca"
 LOG_TEMPLATES="/logging"
 LOG_DEST="/storm/log4j2"
-APACHE_STORM_DIR="/apache-storm-1.1.1"
+APACHE_STORM_DIR="/apache-storm-1.2.3"
 
 ZOOKEEPER_WAIT=${ZOOKEEPER_WAIT:-"true"}
 ZOOKEEPER_WAIT_TIMEOUT=${ZOOKEEPER_WAIT_TIMEOUT:-"3"}