OY-4905 replace docker-compose with docker compose

Opetushallitus · Aug 6, 2024 · 4f5d07c · 4f5d07c
1 parent 2afc43b
commit 4f5d07c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Project-specific configuration
-EXECUTABLES = lein docker docker-compose npm lftp
+EXECUTABLES = lein docker npm lftp
 PORTS=15432 16379 15433 1221 16380 16381 8350 8351 8352 8353
-TOOL_VERSIONS := node:8.11 npm:6 docker-compose:1.21 lein:2.9
+TOOL_VERSIONS := node:8.11 npm:6 lein:2.9
 
 VIRKAILIJA_CONFIG ?= ../ataru-secrets/virkailija-local-dev.edn
 HAKIJA_CONFIG ?= ../ataru-secrets/hakija-local-dev.edn
@@ -29,7 +29,7 @@ STOP_ONLY=stop pm2.config.js --only
 
 DOCKER_SUDO ?=
 DOCKER=$(if $(DOCKER_SUDO),sudo )docker
-DOCKER_COMPOSE=COMPOSE_PARALLEL_LIMIT=8 $(if $(DOCKER_SUDO),sudo )docker-compose
+DOCKER_COMPOSE=COMPOSE_PARALLEL_LIMIT=8 $(if $(DOCKER_SUDO),sudo )docker compose
 
 NODE_MODULES=node_modules
 

diff --git a/Makefile.md b/Makefile.md
@@ -33,7 +33,7 @@ make check-tools
 	Verifies that all necessary tools are in path. Is called by most targets
 
 make build-docker-images
-	Build docker images using docker-compose. Is called by many other targets
+	Build docker images using docker compose. Is called by many other targets
 
 make status
 	Shows status of applications and docker containers

diff --git a/README.md b/README.md
@@ -247,7 +247,7 @@ Because vulnerability scanning tools don't work well with clojure, pom.xml is us
 
 ### `make start` hangs in container creation
 
-If your build gets stuck in the phase where all containers are listed by `docker-compose` like so:
+If your build gets stuck in the phase where all containers are listed by `docker compose` like so:
 
 ```bash
 Step 6/7 : RUN chmod a=,u=rw /etc/ssl/private/pure-ftpd.pem
@@ -258,7 +258,7 @@ Step 7/7 : CMD /run.sh -l puredb:/etc/pure-ftpd/pureftpd.pdb -E -j -R -P $PUBLIC
  ---> 1818a90a9990
 Successfully built 1818a90a9990
 Successfully tagged ataru_ataru-test-ftpd:latest
-COMPOSE_PARALLEL_LIMIT=8 docker-compose up -d
+COMPOSE_PARALLEL_LIMIT=8 docker compose up -d
 Creating network "ataru_ataru-test-network" with the default driver
 Creating network "ataru_cypress-http-proxy-network" with driver "bridge"
 Creating ataru_ataru-dev-db_1 ...
@@ -281,7 +281,7 @@ CONTAINER ID        IMAGE               COMMAND             CREATED
 try running Docker Compose manually with
 
 ```bash
-docker-compose up -d
+docker compose up -d
 ```
 
 If everything starts, run `make stop` and now `make start` should work as expected. Why? Who knows...

diff --git a/bin/run-integration-tests-in-ci.sh b/bin/run-integration-tests-in-ci.sh
@@ -7,7 +7,7 @@ echo "Generating nginx configuration"
 ./bin/generate-nginx-conf.sh || exit 1
 
 echo "Starting Docker containers for integration tests"
-docker-compose up -d ataru-cypress-test-db ataru-cypress-test-redis ataru-cypress-http-proxy
+docker compose up -d ataru-cypress-test-db ataru-cypress-test-redis ataru-cypress-http-proxy
 ./bin/wait-for.sh localhost:8354 -t 20 || exit 1
 
 echo "Running ClojureScript build for integration tests"
@@ -31,8 +31,8 @@ RESULT=$?
 
 echo "Stopping processes used by integration tests"
 npx pm2 kill
-docker-compose kill ataru-cypress-test-db ataru-cypress-http-proxy
-docker-compose rm -f ataru-cypress-test-db ataru-cypress-http-proxy
+docker compose kill ataru-cypress-test-db ataru-cypress-http-proxy
+docker compose rm -f ataru-cypress-test-db ataru-cypress-http-proxy
 
 if [ $RESULT != 0 ]; then
   echo "Integration tests failed! Please see logs for more info"