inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-06-02 17:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Archetypes - Scripts improvement error messages

Browse Source 
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
This commit is contained in:
Jose Luis Osorno 2019-01-14 15:44:36 +01:00
parent a7211c206b
commit d2e21a38c6
6 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -86,24 +86,22 @@ EXIT /B 0
docker-compose -f "%COMPOSE_FILE_PATH%" down docker-compose -f "%COMPOSE_FILE_PATH%" down
EXIT /B 0 EXIT /B 0
:build :build
docker rmi alfresco-content-services-${rootArtifactId}:development
docker rmi alfresco-share-${rootArtifactId}:development
call %MVN_EXEC% clean install -DskipTests call %MVN_EXEC% clean install -DskipTests
EXIT /B 0 EXIT /B 0
:build_share :build_share
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${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 call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar
EXIT /B 0 EXIT /B 0
:build_acs :build_acs
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${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 call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar
EXIT /B 0 EXIT /B 0
:tail :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 EXIT /B 0
:tail_all :tail_all
docker-compose -f "%COMPOSE_FILE_PATH%" logs --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 call %MVN_EXEC% verify -pl integration-tests
EXIT /B 0 EXIT /B 0
:purge :purge
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
EXIT /B 0 EXIT /B 0

18
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -25,33 +25,31 @@ start_acs() {
} }
down() { 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() { purge() {
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
} }
build() { build() {
docker rmi alfresco-content-services-${rootArtifactId}:development
docker rmi alfresco-share-${rootArtifactId}:development
${symbol_dollar}MVN_EXEC clean install -DskipTests=true ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
} }
build_share() { build_share() {
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-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 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,${rootArtifactId}-share-docker
${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar
} }
build_acs() { build_acs() {
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-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 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,${rootArtifactId}-platform-docker
${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar
} }
tail() { tail() {

11
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -65,10 +65,11 @@ EXIT /B %ERRORLEVEL%
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0 EXIT /B 0
:down :down
docker-compose -f "%COMPOSE_FILE_PATH%" down if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down
)
EXIT /B 0 EXIT /B 0
:build :build
docker rmi alfresco-content-services-${rootArtifactId}:development
call %MVN_EXEC% clean install -DskipTests call %MVN_EXEC% clean install -DskipTests
EXIT /B 0 EXIT /B 0
:tail :tail
@ -81,7 +82,7 @@ EXIT /B 0
call %MVN_EXEC% verify call %MVN_EXEC% verify
EXIT /B 0 EXIT /B 0
:purge :purge
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
EXIT /B 0 EXIT /B 0

11
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -17,17 +17,18 @@ start() {
} }
down() { 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() { purge() {
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
} }
build() { build() {
docker rmi alfresco-content-services-${rootArtifactId}:development
${symbol_dollar}MVN_EXEC clean install -DskipTests=true ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
} }

13
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -74,17 +74,16 @@ EXIT /B 0
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
EXIT /B 0 EXIT /B 0
:down :down
docker-compose -f "%COMPOSE_FILE_PATH%" down if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down
)
EXIT /B 0 EXIT /B 0
:build :build
docker rmi alfresco-content-services-${rootArtifactId}:development
docker rmi alfresco-share-${rootArtifactId}:development
call %MVN_EXEC% clean install -DskipTests call %MVN_EXEC% clean install -DskipTests
EXIT /B 0 EXIT /B 0
:build_share :build_share
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
docker rmi alfresco-share-${rootArtifactId}:development
call %MVN_EXEC% clean install -DskipTests call %MVN_EXEC% clean install -DskipTests
EXIT /B 0 EXIT /B 0
:tail :tail
@ -97,7 +96,7 @@ EXIT /B 0
call %MVN_EXEC% verify call %MVN_EXEC% verify
EXIT /B 0 EXIT /B 0
:purge :purge
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
EXIT /B 0 EXIT /B 0

12
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -21,24 +21,24 @@ start_share() {
} }
down() { 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() { purge() {
docker volume rm ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume docker volume rm -f ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume docker volume rm -f ${rootArtifactId}-ass-volume
} }
build() { build() {
docker rmi alfresco-share-${rootArtifactId}:development
${symbol_dollar}MVN_EXEC clean install -DskipTests=true ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
} }
build_share() { build_share() {
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-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 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 ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
} }