diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh b/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh index 944b0f73675c01233d8b5d5fd2f03f09ac4abb06..ce73c6530ca3ff0004bd8903cdf14fa4471d8715 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 830b124b8cc1969cbe17849985735c36c949fccc..2eb599f17b4211c036785fb58e491d4e3fbd749b 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 0f4070cd242b8f295f299d609914b41a792256c5..ca756d03882b899b9cd970aaf629cd822a39faf5 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 86a580fd026d2f62067962dbb99c06e6b71c461c..7b4e9e1ad770583dc3d5f256243949d0fcd14073 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