From c9656ba86acf0b953f79230ca2ef828ac297315d Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Thu, 17 Feb 2022 08:42:55 +0100
Subject: [PATCH] export container logs
---
smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh | 2 +-
smp-docker/compose/tomcat-mysql/runCompose.sh | 1 +
smp-docker/compose/tomcat-mysql/stopClearCompose.sh | 2 +-
smp-docker/compose/weblogic-oracle/stopClearCompose.sh | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh b/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
index 944b0f736..ce73c6530 100755
--- a/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
+++ b/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
@@ -9,7 +9,7 @@ PREFIX="smp-sml-tomcat-mysql"
# clear volume and containers - to run restart from scratch
function clearOldContainers {
echo "Save docker log to docker-file"
- docker logs ${PREFIX} 2>&1 > smp-container.log
+ docker logs ${PREFIX} > smp-container.log 2>&1
echo "Clear containers and volumes"
docker-compose -p "${PREFIX}" rm -s -f -v
}
diff --git a/smp-docker/compose/tomcat-mysql/runCompose.sh b/smp-docker/compose/tomcat-mysql/runCompose.sh
index 830b124b8..2eb599f17 100755
--- a/smp-docker/compose/tomcat-mysql/runCompose.sh
+++ b/smp-docker/compose/tomcat-mysql/runCompose.sh
@@ -2,6 +2,7 @@
WORKING_DIR="$(dirname $0)"
SML_INIT_DATABASE="../../../smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl"
+#SML_INIT_DATABASE_DATA="../../../smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql"
SML_INIT_DATABASE_DATA="../../../smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql"
# soap ui data
PREFIX="smp-tomcat-mysql"
diff --git a/smp-docker/compose/tomcat-mysql/stopClearCompose.sh b/smp-docker/compose/tomcat-mysql/stopClearCompose.sh
index 0f4070cd2..ca756d038 100755
--- a/smp-docker/compose/tomcat-mysql/stopClearCompose.sh
+++ b/smp-docker/compose/tomcat-mysql/stopClearCompose.sh
@@ -9,7 +9,7 @@ PREFIX="smp-tomcat-mysql"
# clear volume and containers - to run restart from scratch
function clearOldContainers {
echo "Save docker log to docker-file"
- docker logs ${PREFIX} 2>&1 > smp-container.log
+ docker logs ${PREFIX} > smp-container.log 2>&1
echo "Clear containers and volumes"
docker-compose -p "${PREFIX}" rm -s -f -v
}
diff --git a/smp-docker/compose/weblogic-oracle/stopClearCompose.sh b/smp-docker/compose/weblogic-oracle/stopClearCompose.sh
index 86a580fd0..7b4e9e1ad 100755
--- a/smp-docker/compose/weblogic-oracle/stopClearCompose.sh
+++ b/smp-docker/compose/weblogic-oracle/stopClearCompose.sh
@@ -14,7 +14,7 @@ function clearOldContainers {
echo "Database stopped" > ./status-folder/database.status
echo "Save docker log to docker-file"
- docker logs ${PREFIX} 2>&1 > smp-container.log
+ docker logs ${PREFIX} > smp-container.log 2>&1
echo "Clear containers and volumes"
docker-compose -p "${PREFIX}" rm -s -f -v
--
GitLab