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

This commit is contained in:
Domenico Sibilio 2024-07-18 09:50:19 +02:00 committed by GitHub
parent 459e3f1424
commit 906a608ffa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 44 additions and 44 deletions

View File

@ -83,37 +83,37 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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 EXIT /B 0
:start_share :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 EXIT /B 0
:start_acs :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 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
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
call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
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
call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f 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"
EXIT /B 0 EXIT /B 0
:prepare-test :prepare-test
call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker

View File

@ -13,20 +13,20 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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() { 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() { 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() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then 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 fi
} }
@ -41,23 +41,23 @@ build() {
} }
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
${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
} }
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
${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { 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() { prepare_test() {

View File

@ -71,21 +71,21 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f 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"
EXIT /B 0 EXIT /B 0
:prepare_test :prepare_test
call %MVN_EXEC% verify -DskipTests=true call %MVN_EXEC% verify -DskipTests=true

View File

@ -13,12 +13,12 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then 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 fi
} }
@ -33,11 +33,11 @@ build() {
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { 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() { prepare_test() {

View File

@ -55,29 +55,29 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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 EXIT /B 0
:start_share :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 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
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
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f 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"
EXIT /B 0 EXIT /B 0
:purge :purge
docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume

View File

@ -13,16 +13,16 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-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() { 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
} }
down() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then 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 fi
} }
@ -37,17 +37,17 @@ build() {
} }
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
${symbol_dollar}MVN_EXEC clean package ${symbol_dollar}MVN_EXEC clean package
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { tail_all() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
} }
case "${symbol_dollar}1" in case "${symbol_dollar}1" in

View File

@ -82,8 +82,8 @@ install it separately after you've installed Docker.
4. Verify the installation of Docker Compose. 4. Verify the installation of Docker Compose.
``` ```
$ docker-compose -v $ docker compose version
docker-compose version 1.22.0, build f46880f Docker Compose version v2.28.1-desktop.1
``` ```
## Generate your project from the archetypes ## Generate your project from the archetypes