Skip to content

Commit

Permalink
Update docker compose command to V2 (#950)
Browse files Browse the repository at this point in the history
Update docker compose command to V2 in accordance of deprecation of docker-compose V1 on GitHub Actions runner's ubuntu image.
  • Loading branch information
fourjae authored Aug 3, 2024
1 parent 52d2732 commit 54910c1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
8 changes: 4 additions & 4 deletions build/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 54910c1

Please sign in to comment.