From 16682f04b68173ec8591acfdd3493f0d7741df2e Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Wed, 16 Feb 2022 20:15:36 +0100
Subject: [PATCH] Upgrade tomcat versin to 8.5.73
---
smp-docker/images/tomcat-mysql-smp-sml/Dockerfile | 8 +++++---
smp-docker/images/tomcat-mysql/Dockerfile | 8 ++++----
smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile | 4 ++--
smp-soapui-tests/scripts/clean-install-smp.sh | 2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile b/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
index 5a8348336..eef2ac544 100755
--- a/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
+++ b/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
@@ -9,8 +9,10 @@ ENV SMP_HOME=/opt/smp \
MYSQL_DRV_VERSION=5.1.46 \
MYSQL_DRV_SHA1=9a3e63b387e376364211e96827bc27db8d7a92e9 \
TOMCAT_MAJOR=8 \
- TOMCAT_VERSION=8.5.31 \
- TOMCAT_SHA512=51d8877782bc975b8c566263df7e55f383e617aa3c81ea2c219fed18e1f5d9e8233a92100de95b9a8df69ce5c0ad89a195d5b7e5647fcf9df26231870073a9cb \
+ TOMCAT_VERSION=8.5.73 \
+ #native version is dependant from tomcat version!
+ TOMCAT_NAVITVE_VERSION=1.2.31 \
+ TOMCAT_SHA512=bc39e4545c779326803bc2574592d72dfea1b56e4cb95d7ac5264c1b91f3da8b1b94f53c53390d1c8348ebe1dad2c10719cc2746b179e1085719d964aa60a779 \
SMP_DB_SCHEMA=smp \
SMP_DB_USER=smp \
SMP_INIT_PROPERTY_DELIMITER="||" \
@@ -97,7 +99,7 @@ RUN apt-get update \
RUN export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") \
&& cd $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/bin \
&& tar xfz tomcat-native.tar.gz \
- && cd tomcat-native-1.2.16-src/native \
+ && cd tomcat-native-${TOMCAT_NAVITVE_VERSION}-src/native \
&& ./configure && make && make install
# dowload and deploy sml
diff --git a/smp-docker/images/tomcat-mysql/Dockerfile b/smp-docker/images/tomcat-mysql/Dockerfile
index deb718ebf..6aa32f491 100755
--- a/smp-docker/images/tomcat-mysql/Dockerfile
+++ b/smp-docker/images/tomcat-mysql/Dockerfile
@@ -7,10 +7,10 @@ ENV SMP_HOME=/opt/smp \
MYSQL_DRV_VERSION=5.1.46 \
MYSQL_DRV_SHA1=9a3e63b387e376364211e96827bc27db8d7a92e9 \
TOMCAT_MAJOR=8 \
- TOMCAT_VERSION=8.5.31 \
- TOMCAT_SHA512=51d8877782bc975b8c566263df7e55f383e617aa3c81ea2c219fed18e1f5d9e8233a92100de95b9a8df69ce5c0ad89a195d5b7e5647fcf9df26231870073a9cb \
- DB_SCHEMA=smp \
- DB_USER=smp \
+ TOMCAT_VERSION=8.5.73 \
+ TOMCAT_SHA512=bc39e4545c779326803bc2574592d72dfea1b56e4cb95d7ac5264c1b91f3da8b1b94f53c53390d1c8348ebe1dad2c10719cc2746b179e1085719d964aa60a779 \
+ DB_SCHEMA=smp \
+ DB_USER=smp \
DB_USER_PASSWORD=smp \
MYSQL_ROOT_PASSWORD=root
diff --git a/smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile b/smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile
index bf686a414..07c5a3398 100644
--- a/smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile
+++ b/smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile
@@ -11,8 +11,8 @@ ENV SML_VERSION=3.1.2 \
SMP_SHA1=52ba09257948233e920638f7a90f9bfa120910ca \
SMP_CONF_SHA1=af40537d2874775f2ab34c538682ef7ac50efdb3 \
TOMCAT_MAJOR=8 \
- TOMCAT_VERSION=8.5.31 \
- TOMCAT_SHA512=51d8877782bc975b8c566263df7e55f383e617aa3c81ea2c219fed18e1f5d9e8233a92100de95b9a8df69ce5c0ad89a195d5b7e5647fcf9df26231870073a9cb \
+ TOMCAT_VERSION=8.5.73 \
+ TOMCAT_SHA512=bc39e4545c779326803bc2574592d72dfea1b56e4cb95d7ac5264c1b91f3da8b1b94f53c53390d1c8348ebe1dad2c10719cc2746b179e1085719d964aa60a779 \
MYSQL_DRV_VERSION=5.1.46 \
MYSQL_DRV_SHA1=9a3e63b387e376364211e96827bc27db8d7a92e9 \
DATA_DIR=/data \
diff --git a/smp-soapui-tests/scripts/clean-install-smp.sh b/smp-soapui-tests/scripts/clean-install-smp.sh
index caf17ad87..eb3c32d25 100755
--- a/smp-soapui-tests/scripts/clean-install-smp.sh
+++ b/smp-soapui-tests/scripts/clean-install-smp.sh
@@ -9,7 +9,7 @@ SMP_SETUP_SHA256=faede91a13ca8e464c8703b3074c7307058633eb5c969dd1a495bf17fdaa02e
MYSQL_DRV_VERSION=5.1.46
MYSQL_DRV_SHA1=9a3e63b387e376364211e96827bc27db8d7a92e9
TOMCAT_MAJOR=8
-TOMCAT_VERSION=8.5.31
+TOMCAT_VERSION=8.5.73
TOMCAT_SHA512=51d8877782bc975b8c566263df7e55f383e617aa3c81ea2c219fed18e1f5d9e8233a92100de95b9a8df69ce5c0ad89a195d5b7e5647fcf9df26231870073a9cb
SMP_DB_SCHEMA=supportsmp
SMP_DB_USER=smp
--
GitLab