Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker compose command to V2 #950

Merged
merged 2 commits into from
Aug 3, 2024
Merged

Update docker compose command to V2 #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e58e2
update docker compose command
fourjae Aug 3, 2024
5dd7e5b
README, CONTRIBUTING md file command update
fourjae Aug 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading