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

Jump to bottom

Update docker command to docker-compose v2 #255

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Update docker command to docker-compose v2 #255

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
335aa71
Update docker command to docker-compose v2
ayeshLK Aug 9, 2024
119eeb7
Update GraalVM workflow to use docker-compose v2
ayeshLK Aug 9, 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/build-with-bal-test-graalvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Start MongoDB Server
run: |
cd ballerina/tests/resources/docker
docker-compose up -d
docker compose up -d
- name: Test with GraalVM
run: |
Expand All @@ -65,4 +65,4 @@ jobs:
- name: Stop MongoDB Server
run: |
cd ballerina/tests/resources/docker
docker-compose down
docker compose down
8 changes: 4 additions & 4 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ task startMongodbServer() {
println("Starting mongodb server...")
exec {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine 'cmd', '/c', "docker-compose -f tests/resources/docker/docker-compose.yml up && exit %%ERRORLEVEL%%"
commandLine 'cmd', '/c', "docker compose -f tests/resources/docker/docker-compose.yml up && exit %%ERRORLEVEL%%"
} else {
commandLine 'sh', '-c', "docker-compose -f tests/resources/docker/docker-compose.yml up -d"
commandLine 'sh', '-c', "docker compose -f tests/resources/docker/docker-compose.yml up -d"
}
}
}
Expand All @@ -108,9 +108,9 @@ task stopMongodbServer() {
println("Stopping mongodb server...")
exec {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine 'cmd', '/c', "docker-compose -f tests/resources/docker/docker-compose.yml down && exit %%ERRORLEVEL%%"
commandLine 'cmd', '/c', "docker compose -f tests/resources/docker/docker-compose.yml down && exit %%ERRORLEVEL%%"
} else {
commandLine 'sh', '-c', "docker-compose -f tests/resources/docker/docker-compose.yml down"
commandLine 'sh', '-c', "docker compose -f tests/resources/docker/docker-compose.yml down"
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions ballerina/tests/resources/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

services:
mongo-no-auth:
image: mongo:4.2
Expand Down
2 changes: 0 additions & 2 deletions examples/resources/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

services:
mongodb:
image: mongo:4.2
Expand Down
Loading