diff --git a/dev/README.md b/dev/README.md index 149a4b005d..c52d4ba901 100644 --- a/dev/README.md +++ b/dev/README.md @@ -74,9 +74,9 @@ The simplest way to create these, is to use the `docker-compose.yml` file in the separate terminal as it will continue to run until you kill it with `^C`. ~~~ # The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to -the `docker-compose` command. +the `docker compose` command. cd acs-packaging -docker-compose -f dev/docker-compose.yml up +docker compose -f dev/docker-compose.yml up Creating dev_activemq_1 ... done Creating dev_solr6_1 ... done Creating dev_postgres_1 ... done @@ -131,12 +131,12 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay When finished, kill the tomcat instance and stop the Docker instances. You will normally also remove the Docker containers, as you will need a clean database if you are going to issue another `mvn clean install` command. If you started `docker-compose` in a separate terminal session, -simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`. +simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`. ~~~ ^C ... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default] -docker-compose -f dev/docker-compose.yml rm +docker compose -f dev/docker-compose.yml rm Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1 Are you sure? [yN] y Removing dev_transform-core-aio_1 ... done diff --git a/dev/aliases b/dev/aliases index 8388adff6a..3fa96b3bb2 100755 --- a/dev/aliases +++ b/dev/aliases @@ -105,6 +105,6 @@ alias entXS='entS && entP' alias drm='docker rm -f $(docker ps -q)' alias arm='rm -rf `find . -name alf_data`' alias envUp='./acs-packaging/scripts/dev/start-compose.sh' -alias envStop='docker-compose -f acs-packaging/dev/docker-compose.yml stop' -alias envKill='docker-compose -f acs-packaging/dev/docker-compose.yml kill' -alias envRm='docker-compose -f acs-packaging/dev/docker-compose.yml rm' +alias envStop='docker compose -f acs-packaging/dev/docker-compose.yml stop' +alias envKill='docker compose -f acs-packaging/dev/docker-compose.yml kill' +alias envRm='docker compose -f acs-packaging/dev/docker-compose.yml rm' diff --git a/docs/creating-a-t-engine.md b/docs/creating-a-t-engine.md index 895fd4fe57..b03fe30c67 100644 --- a/docs/creating-a-t-engine.md +++ b/docs/creating-a-t-engine.md @@ -266,7 +266,7 @@ Hello World T-Engine. See [here](custom-transforms-and-renditions.md#configure-a 6. Start ACS using the modified docker-compose file. ```bash - docker-compose up + docker compose up ``` #### Test custom rendition diff --git a/scripts/dev/start-compose.sh b/scripts/dev/start-compose.sh index 2db5ada025..62b3c60871 100755 --- a/scripts/dev/start-compose.sh +++ b/scripts/dev/start-compose.sh @@ -3,4 +3,4 @@ export TRANSFORMERS_TAG=$(mvn -f acs-packaging/pom.xml help:evaluate -Dexpressio export TRANSFORM_ROUTER_TAG=$(mvn -f acs-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout) # .env files are picked up from project directory correctly on docker-compose 1.23.0+ -docker-compose -f acs-packaging/dev/docker-compose.yml up \ No newline at end of file +docker compose -f acs-packaging/dev/docker-compose.yml up \ No newline at end of file