From d2e21a38c616504260e85aaa13d401b04809bb0b Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Mon, 14 Jan 2019 15:44:36 +0100 Subject: [PATCH] Archetypes - Scripts improvement error messages Improve the archetypes' run scripts to avoid needless error messages: - Execute stop task only if the docker-compose file exists in the target folder - Remove unnecessary docker rmi commands --- .../main/resources/archetype-resources/run.bat | 14 ++++++-------- .../main/resources/archetype-resources/run.sh | 18 ++++++++---------- .../main/resources/archetype-resources/run.bat | 11 ++++++----- .../main/resources/archetype-resources/run.sh | 11 ++++++----- .../main/resources/archetype-resources/run.bat | 13 ++++++------- .../main/resources/archetype-resources/run.sh | 12 ++++++------ 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat index 0d40a2fc..b4068cb0 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat @@ -86,24 +86,22 @@ EXIT /B 0 docker-compose -f "%COMPOSE_FILE_PATH%" down EXIT /B 0 :build - docker rmi alfresco-content-services-${rootArtifactId}:development - docker rmi alfresco-share-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests EXIT /B 0 :build_share docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share - docker rmi alfresco-share-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar EXIT /B 0 :build_acs docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs - docker rmi alfresco-content-services-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar EXIT /B 0 :tail - docker-compose -f "%COMPOSE_FILE_PATH%" logs -f + if exist "%COMPOSE_FILE_PATH%" ( + docker-compose -f "%COMPOSE_FILE_PATH%" logs -f + ) EXIT /B 0 :tail_all docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" @@ -112,7 +110,7 @@ EXIT /B 0 call %MVN_EXEC% verify -pl integration-tests EXIT /B 0 :purge - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh index 86a1ab0d..0bcc6423 100755 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh @@ -25,33 +25,31 @@ start_acs() { } down() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then + docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + fi } purge() { - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume } build() { - docker rmi alfresco-content-services-${rootArtifactId}:development - docker rmi alfresco-share-${rootArtifactId}:development ${symbol_dollar}MVN_EXEC clean install -DskipTests=true } build_share() { docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share - docker rmi alfresco-share-${rootArtifactId}:development - ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar + ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar,${rootArtifactId}-share-docker } build_acs() { docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs - docker rmi alfresco-content-services-${rootArtifactId}:development - ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar + ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar,${rootArtifactId}-platform-docker } tail() { diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat index 4e07e284..2ebcca1f 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -65,10 +65,11 @@ EXIT /B %ERRORLEVEL% docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :down - docker-compose -f "%COMPOSE_FILE_PATH%" down + if exist "%COMPOSE_FILE_PATH%" ( + docker-compose -f "%COMPOSE_FILE_PATH%" down + ) EXIT /B 0 :build - docker rmi alfresco-content-services-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests EXIT /B 0 :tail @@ -81,7 +82,7 @@ EXIT /B 0 call %MVN_EXEC% verify EXIT /B 0 :purge - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh index 7192937a..3024fc36 100755 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -17,17 +17,18 @@ start() { } down() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then + docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + fi } purge() { - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume } build() { - docker rmi alfresco-content-services-${rootArtifactId}:development ${symbol_dollar}MVN_EXEC clean install -DskipTests=true } diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat index b7d79d74..daa63269 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -74,17 +74,16 @@ EXIT /B 0 docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share EXIT /B 0 :down - docker-compose -f "%COMPOSE_FILE_PATH%" down + if exist "%COMPOSE_FILE_PATH%" ( + docker-compose -f "%COMPOSE_FILE_PATH%" down + ) EXIT /B 0 :build - docker rmi alfresco-content-services-${rootArtifactId}:development - docker rmi alfresco-share-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests EXIT /B 0 :build_share docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share - docker rmi alfresco-share-${rootArtifactId}:development call %MVN_EXEC% clean install -DskipTests EXIT /B 0 :tail @@ -97,7 +96,7 @@ EXIT /B 0 call %MVN_EXEC% verify EXIT /B 0 :purge - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh index 86ac8474..df1607ba 100755 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -21,24 +21,24 @@ start_share() { } down() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then + docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + fi } purge() { - docker volume rm ${rootArtifactId}-acs-volume - docker volume rm ${rootArtifactId}-db-volume - docker volume rm ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-acs-volume + docker volume rm -f ${rootArtifactId}-db-volume + docker volume rm -f ${rootArtifactId}-ass-volume } build() { - docker rmi alfresco-share-${rootArtifactId}:development ${symbol_dollar}MVN_EXEC clean install -DskipTests=true } build_share() { docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share - docker rmi alfresco-share-${rootArtifactId}:development ${symbol_dollar}MVN_EXEC clean install -DskipTests=true }