Unverified Commit 906a608f authored by Domenico Sibilio's avatar Domenico Sibilio Committed by GitHub
Browse files

ACS-8405 Migrate to Docker Compose v2 (#676)

parent 459e3f14

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

+10 −10
Original line number Diff line number Diff line
@@ -83,37 +83,37 @@ EXIT /B %ERRORLEVEL% 
    docker volume create ${rootArtifactId}-acs-volume

    docker volume create ${rootArtifactId}-db-volume

    docker volume create ${rootArtifactId}-ass-volume

    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d

    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d

EXIT /B 0

:start_share

    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

:start_acs

    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs

    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs

EXIT /B 0

:down

    if exist "%COMPOSE_FILE_PATH%" (

        docker-compose -f "%COMPOSE_FILE_PATH%" down

        docker compose -f "%COMPOSE_FILE_PATH%" down

    )

EXIT /B 0

:build

	call %MVN_EXEC% clean package

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 compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share

    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share

	call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker

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 compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs

    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs

	call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker

EXIT /B 0

:tail

    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f

    docker compose -f "%COMPOSE_FILE_PATH%" logs -f

EXIT /B 0

:tail_all

    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

EXIT /B 0

:prepare-test

    call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker

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

+10 −10
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ start() { 
    docker volume create ${rootArtifactId}-acs-volume

    docker volume create ${rootArtifactId}-db-volume

    docker volume create ${rootArtifactId}-ass-volume

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d

}



start_share() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share

}



start_acs() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs

}



down() {

    if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then

        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down

        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down

    fi

}
@@ -41,23 +41,23 @@ build() { 
}



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 compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share

    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share

    ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${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 compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs

    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs

    ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker

}



tail() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f

}



tail_all() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"

}



prepare_test() {

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

+4 −4
Original line number Diff line number Diff line
@@ -71,21 +71,21 @@ EXIT /B %ERRORLEVEL% 
    docker volume create ${rootArtifactId}-acs-volume

    docker volume create ${rootArtifactId}-db-volume

    docker volume create ${rootArtifactId}-ass-volume

    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d

    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

        docker compose -f "%COMPOSE_FILE_PATH%" down

    )

EXIT /B 0

:build

	call %MVN_EXEC% clean package

EXIT /B 0

:tail

    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f

    docker compose -f "%COMPOSE_FILE_PATH%" logs -f

EXIT /B 0

:tail_all

    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

EXIT /B 0

:prepare_test

    call %MVN_EXEC% verify -DskipTests=true

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

+4 −4
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ start() { 
    docker volume create ${rootArtifactId}-acs-volume

    docker volume create ${rootArtifactId}-db-volume

    docker volume create ${rootArtifactId}-ass-volume

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d

}



down() {

    if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then

        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down

        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down

    fi

}
@@ -33,11 +33,11 @@ build() { 
}



tail() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f

}



tail_all() {

    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"

    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"

}



prepare_test() {

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

+7 −7
Original line number Diff line number Diff line
@@ -55,29 +55,29 @@ EXIT /B %ERRORLEVEL% 
    docker volume create ${rootArtifactId}-acs-volume

    docker volume create ${rootArtifactId}-db-volume

    docker volume create ${rootArtifactId}-ass-volume

    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d

    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d

EXIT /B 0

:start_share

    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

:down

    if exist "%COMPOSE_FILE_PATH%" (

        docker-compose -f "%COMPOSE_FILE_PATH%" down

        docker compose -f "%COMPOSE_FILE_PATH%" down

    )

EXIT /B 0

:build

	call %MVN_EXEC% clean package

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 compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share

    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share

	call %MVN_EXEC% clean package

EXIT /B 0

:tail

    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f

    docker compose -f "%COMPOSE_FILE_PATH%" logs -f

EXIT /B 0

:tail_all

    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"

EXIT /B 0

:purge

    docker volume rm -f ${rootArtifactId}-acs-volume