From 49bc08c88000b9d687b454a68d39e5ed415e6424 Mon Sep 17 00:00:00 2001 From: young ha Hwang <47708717+fourjae@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:53:20 +0900 Subject: [PATCH] Update docker compose command to V2 (#950) Update docker compose command to V2 in accordance of deprecation of docker-compose V1 on GitHub Actions runner's ubuntu image. --- .github/workflows/ci.yml | 4 ++-- CONTRIBUTING.md | 2 +- build/docker/README.md | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3254891d..f3759c51b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: run: make build - name: Stack - run: docker-compose -f build/docker/docker-compose.yml up --build -d + run: docker compose -f build/docker/docker-compose.yml up --build -d - name: Test run: go test -tags integration -race -coverprofile=coverage.txt -covermode=atomic -v ./... @@ -77,7 +77,7 @@ jobs: run: make tools - name: Stack - run: docker-compose -f build/docker/docker-compose.yml up --build -d + run: docker compose -f build/docker/docker-compose.yml up --build -d - name: Bench run: make bench diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 78cdf8268..ef6f2dc9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ make build # executable: ./bin/yorkie You can set testing environment via Docker Compose. It is needed because integration tests require local applications like MongoDB. ```sh -docker-compose -f build/docker/docker-compose.yml up --build -d +docker compose -f build/docker/docker-compose.yml up --build -d make test ``` diff --git a/build/docker/README.md b/build/docker/README.md index 58e2afb05..ef18072f2 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -5,14 +5,14 @@ running multi-container Docker applications. We use Docker Compose to run the applications needed during Yorkie development. When developing Yorkie, we can easily run the required dependant applications -through `docker-compose` command. +through `docker compose` command. ```bash -# Run docker-compose up and Compose starts and runs apps. -docker-compose -f docker/docker-compose.yml up --build -d +# Run docker compose up and Compose starts and runs apps. +docker compose -f docker/docker-compose.yml up --build -d # Shut down the apps -docker-compose -f docker/docker-compose.yml down +docker compose -f docker/docker-compose.yml down ``` The docker-compose files we use are as follows: