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 e5b85657..3ce54dfd 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 @@ -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 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 d11437eb..7326bf65 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 @@ -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() { 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 e735564a..07e7571b 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 @@ -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 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 9def3b95..2ec1c132 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 @@ -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() { 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 aba062fb..6b8b1b33 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 @@ -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 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 493a5146..9e028e2a 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 @@ -13,16 +13,16 @@ 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 } 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 } @@ -37,17 +37,17 @@ 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 } 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" } case "${symbol_dollar}1" in diff --git a/docs/getting-started.md b/docs/getting-started.md index 6188cf06..182ac367 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -82,8 +82,8 @@ install it separately after you've installed Docker. 4. Verify the installation of Docker Compose. ``` -$ docker-compose -v -docker-compose version 1.22.0, build f46880f +$ docker compose version +Docker Compose version v2.28.1-desktop.1 ``` ## Generate your project from the archetypes