Merge pull request #255 from ayeshLK/master

Update docker command to docker-compose v2
ballerina-platform · Aug 9, 2024 · 76cdb7e · 76cdb7e
2 parents 15e534c + 119eeb7
commit 76cdb7e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -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: |
@@ -65,4 +65,4 @@ jobs:
       - name: Stop MongoDB Server
         run: |
           cd ballerina/tests/resources/docker
-          docker-compose down
+          docker compose down
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -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"
             }
         }
     }
@@ -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"
             }
         }
     }

diff --git a/ballerina/tests/resources/docker/docker-compose.yml b/ballerina/tests/resources/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mongo-no-auth:
     image: mongo:4.2

diff --git a/examples/resources/docker/docker-compose.yml b/examples/resources/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mongodb:
     image: mongo:4.2