From 0a37dafef541dbb572a2ff493f229896d2150536 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Thu, 26 Sep 2019 11:43:50 +0200
Subject: [PATCH] add tomcat/mysql compose files for SOAPUI testing
---
smp-docker/images/tomcat-mysql/Dockerfile | 2 +-
smp-docker/images/tomcat-mysql/entrypoint.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/smp-docker/images/tomcat-mysql/Dockerfile b/smp-docker/images/tomcat-mysql/Dockerfile
index 4cb7d1ab0..5d4e5bfc9 100755
--- a/smp-docker/images/tomcat-mysql/Dockerfile
+++ b/smp-docker/images/tomcat-mysql/Dockerfile
@@ -46,7 +46,7 @@ ADD ./artefacts /tmp/artefacts
# install SMP
- run unzip /tmp/artefacts/smp-setup.zip -d /tmp/ \
+RUN unzip /tmp/artefacts/smp-setup.zip -d /tmp/ \
&& mv /tmp/artefacts/smp.war $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/webapps/
VOLUME ["/data"]
diff --git a/smp-docker/images/tomcat-mysql/entrypoint.sh b/smp-docker/images/tomcat-mysql/entrypoint.sh
index 76d8a1645..f7209d529 100755
--- a/smp-docker/images/tomcat-mysql/entrypoint.sh
+++ b/smp-docker/images/tomcat-mysql/entrypoint.sh
@@ -91,10 +91,10 @@ init_mysql() {
if [ -f "/tmp/custom-database-scripts/mysql5innodb-data.sql" ]
then
echo "Use custom init script! "
- mysql -h localhost -u root --password=$MYSQL_ROOT_PASSWORD $DB_SCHEMA < "tmp/custom-database-scripts/mysql5innodb-data.sql"
+ mysql -h localhost -u root --password=$MYSQL_ROOT_PASSWORD $DB_SCHEMA < "/tmp/custom-database-scripts/mysql5innodb-data.sql"
else
echo "Use default init script!"
- mysql -h localhost -u root --password=$MYSQL_ROOT_PASSWORD $DB_SCHEMA < "/tmp/artefacts/smp-4.1.1-SNAPSHOT/database-scripts/mysql5innodb-data.sql"
+ mysql -h localhost -u root --password=$MYSQL_ROOT_PASSWORD $DB_SCHEMA < "/tmp/smp-4.1.1-SNAPSHOT/database-scripts/mysql5innodb-data.sql"
fi
fi
--
GitLab