Merge pull request #16845 from overleaf/csh-docker-compose

Replace legacy `docker-compose` with `docker compose`

GitOrigin-RevId: 1a876a5870be55dceecdff9cd1284235840e908f

develop/bin/build

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose build --pull "$@"
+docker compose build --pull "$@"

develop/bin/down

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose down "$@"
+docker compose down "$@"

develop/bin/init

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-docker-compose up --detach mongo
+docker compose up --detach mongo
 curl --max-time 10 --retry 5 --retry-delay 5 --retry-all-errors --silent --output /dev/null localhost:27017
-docker-compose exec mongo mongosh --eval "rs.initiate({ _id: 'overleaf', members: [{ _id: 0, host: 'mongo:27017' }] })"
-docker-compose down mongo
+docker compose exec mongo mongosh --eval "rs.initiate({ _id: 'overleaf', members: [{ _id: 0, host: 'mongo:27017' }] })"
+docker compose down mongo

develop/bin/logs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-docker-compose logs --follow --tail 10 --no-color "$@" \
+docker compose logs --follow --tail 10 --no-color "$@" \
   | ggrep --line-buffered --invert-match "global.gc" \
   | ggrep --line-buffered --invert-match "health.check" \
   | ggrep --line-buffered --invert-match "slow event loop" \

develop/bin/shell

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose exec -it "$@" /bin/bash
+docker compose exec -it "$@" /bin/bash

develop/bin/up

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose up --detach "$@"
+docker compose up --detach "$@"

server-ce/test/Makefile

@@ -1,8 +1,8 @@
 all: test-e2e
 
 test-e2e:
-	docker-compose down -v -t 0
-	docker-compose -f docker-compose.yml run --rm e2e
-	docker-compose down -v -t 0
+	docker compose down -v -t 0
+	docker compose -f docker-compose.yml run --rm e2e
+	docker compose down -v -t 0
 
 .PHONY: test-e2e

services/chat/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/clsi/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/contacts/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/docstore/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/document-updater/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/filestore/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/history-v1/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/notifications/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/project-history/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/project-history/scripts/clear_deleted_history.js

@@ -2,7 +2,7 @@
 
 // To run in dev:
 //
-// docker-compose run --rm project-history scripts/clear_deleted.js
+// docker compose run --rm project-history scripts/clear_deleted.js
 //
 // In production:
 //

services/project-history/scripts/clear_filestore_404.js

@@ -2,7 +2,7 @@
 
 // To run in dev:
 //
-// docker-compose run --rm project-history scripts/clear_deleted.js
+// docker compose run --rm project-history scripts/clear_deleted.js
 //
 // In production:
 //

services/project-history/scripts/clear_project_version_out_of_order.js

@@ -2,7 +2,7 @@
 
 // To run in dev:
 //
-// docker-compose run --rm project-history scripts/clear_deleted.js
+// docker compose run --rm project-history scripts/clear_deleted.js
 //
 // In production:
 //

services/project-history/scripts/flush_all.js

@@ -2,7 +2,7 @@
 
 // To run in dev:
 //
-// docker-compose run --rm project-history scripts/flush_all.js <limit>
+// docker compose run --rm project-history scripts/flush_all.js <limit>
 //
 // In production:
 //

services/project-history/scripts/force_resync.js

@@ -2,7 +2,7 @@
 
 // To run in dev:
 //
-// docker-compose run --rm project-history scripts/clear_deleted.js
+// docker compose run --rm project-history scripts/clear_deleted.js
 //
 // In production:
 //

services/real-time/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)

services/spelling/Makefile

@@ -12,7 +12,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS}
+	docker compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
 	COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)