diff --git a/develop/bin/build b/develop/bin/build index 75dc04161a..bd30abc13f 100755 --- a/develop/bin/build +++ b/develop/bin/build @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker-compose build --pull "$@" +docker compose build --pull "$@" diff --git a/develop/bin/down b/develop/bin/down index ec6ea4c8db..3eaad36736 100755 --- a/develop/bin/down +++ b/develop/bin/down @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker-compose down "$@" +docker compose down "$@" diff --git a/develop/bin/init b/develop/bin/init index 651623458c..4cb2a4eae1 100755 --- a/develop/bin/init +++ b/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 diff --git a/develop/bin/logs b/develop/bin/logs index 41ea6f5114..3288ec05da 100755 --- a/develop/bin/logs +++ b/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" \ diff --git a/develop/bin/shell b/develop/bin/shell index 564df7f5e5..0929c51d12 100755 --- a/develop/bin/shell +++ b/develop/bin/shell @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker-compose exec -it "$@" /bin/bash +docker compose exec -it "$@" /bin/bash diff --git a/develop/bin/up b/develop/bin/up index 9cea84d041..b39c4e3710 100755 --- a/develop/bin/up +++ b/develop/bin/up @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker-compose up --detach "$@" +docker compose up --detach "$@" diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile index 3beffbaad6..80e7d2df6d 100644 --- a/server-ce/test/Makefile +++ b/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 \ No newline at end of file diff --git a/services/chat/Makefile b/services/chat/Makefile index 895605aa1f..4b7e994909 100644 --- a/services/chat/Makefile +++ b/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) diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 12138ecb2f..f23ca5b1af 100644 --- a/services/clsi/Makefile +++ b/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) diff --git a/services/contacts/Makefile b/services/contacts/Makefile index ac6d9e2b80..0fa7a57c8b 100644 --- a/services/contacts/Makefile +++ b/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) diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 55f1c869e5..0a7b2d2908 100644 --- a/services/docstore/Makefile +++ b/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) diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 8d0404cb8f..2ab3313795 100644 --- a/services/document-updater/Makefile +++ b/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) diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 10a2681486..8b656baee1 100644 --- a/services/filestore/Makefile +++ b/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) diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index f31de99977..dc490cf895 100644 --- a/services/history-v1/Makefile +++ b/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) diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 55db1be393..4521201dfb 100644 --- a/services/notifications/Makefile +++ b/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) diff --git a/services/project-history/Makefile b/services/project-history/Makefile index b279101921..e989160d39 100644 --- a/services/project-history/Makefile +++ b/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) diff --git a/services/project-history/scripts/clear_deleted_history.js b/services/project-history/scripts/clear_deleted_history.js index a9ec0a8dcc..579ab06294 100755 --- a/services/project-history/scripts/clear_deleted_history.js +++ b/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: // diff --git a/services/project-history/scripts/clear_filestore_404.js b/services/project-history/scripts/clear_filestore_404.js index 336ad9a01e..3c9ca98cc7 100755 --- a/services/project-history/scripts/clear_filestore_404.js +++ b/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: // diff --git a/services/project-history/scripts/clear_project_version_out_of_order.js b/services/project-history/scripts/clear_project_version_out_of_order.js index 200d20aed1..4adab1e329 100755 --- a/services/project-history/scripts/clear_project_version_out_of_order.js +++ b/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: // diff --git a/services/project-history/scripts/flush_all.js b/services/project-history/scripts/flush_all.js index 0caac5f2e8..83f8fbd44e 100755 --- a/services/project-history/scripts/flush_all.js +++ b/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 +// docker compose run --rm project-history scripts/flush_all.js // // In production: // diff --git a/services/project-history/scripts/force_resync.js b/services/project-history/scripts/force_resync.js index 6f65880747..8f74861ebd 100755 --- a/services/project-history/scripts/force_resync.js +++ b/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: // diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 3141cb258d..58ad064946 100644 --- a/services/real-time/Makefile +++ b/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) diff --git a/services/spelling/Makefile b/services/spelling/Makefile index 61d353dfc2..eb27e03f94 100644 --- a/services/spelling/Makefile +++ b/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)