Commit d2e21a38 authored by Jose Luis Osorno's avatar Jose Luis Osorno
Browse files

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
parent a7211c20

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

+6 −8
Original line number Diff line number Diff line
@@ -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

    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

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

+8 −10
Original line number Diff line number Diff line
@@ -25,33 +25,31 @@ start_acs() { 
}



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() {

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

+6 −5
Original line number Diff line number Diff line
@@ -65,10 +65,11 @@ EXIT /B %ERRORLEVEL% 
    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d

EXIT /B 0

: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

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

+6 −5
Original line number Diff line number Diff line
@@ -17,17 +17,18 @@ start() { 
}



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

}

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

+6 −7
Original line number Diff line number Diff line
@@ -74,17 +74,16 @@ EXIT /B 0 
    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share

EXIT /B 0

: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