Merge pull request #238 from NipunaRanasinghe/master

Update docker command to docker compose v2
ballerina-platform · Aug 15, 2024 · 3cdc77e · 3cdc77e
2 parents 57dc6af + d72ebed
commit 3cdc77e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 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 Redis Server
         run: |
           cd ballerina/tests/resources/docker
-          docker-compose -f docker-compose-standalone.yml up -d 
+          docker compose -f compose-standalone.yml up -d 
 
       - name: Test with GraalVM
         run: |
@@ -65,4 +65,4 @@ jobs:
       - name: Stop Redis Server
         run: |
           cd ballerina/tests/resources/docker
-          docker-compose -f docker-compose-standalone.yml down
+          docker compose -f compose-standalone.yml down
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -2,7 +2,7 @@
 distribution = "2201.7.0"
 org="ballerinax"
 name = "redis"
-version = "3.0.2"
+version = "3.0.3"
 authors = ["Ballerina"]
 keywords = ["IT Operations/Databases",  "Cost/Freemium"]
 icon = "icon.png"
@@ -16,8 +16,8 @@ graalvmCompatible = true
 groupId = "io.ballerina.lib"
 artifactId = "redis-native"
 module = "redis-native"
-version="3.0.2"
-path = "../native/build/libs/redis-native-3.0.2.jar"
+version="3.0.3-SNAPSHOT"
+path = "../native/build/libs/redis-native-3.0.3-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.lettuce"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -128,7 +128,7 @@ dependencies = [
 [[package]]
 org = "ballerinax"
 name = "redis"
-version = "3.0.2"
+version = "3.0.3"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -104,16 +104,16 @@ task startRedisServer() {
     gradle.taskGraph.whenReady { graph ->
         if (graph.hasTask(":${packageName}-ballerina:test")) {
             println("Starting redis server...")
-            def dockerComposeFile = "docker-compose-standalone.yml"
+            def dockerComposeFile = "compose-standalone.yml"
             if (System.getenv("TEST_CLUSTER_MODE")?.toBoolean()) {
-                dockerComposeFile = "docker-compose-cluster.yml"
+                dockerComposeFile = "compose-cluster.yml"
             }
 
             exec {
                 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    commandLine 'cmd', '/c', "docker-compose -f tests/resources/docker/${dockerComposeFile} up && exit %%ERRORLEVEL%%"
+                    commandLine 'cmd', '/c', "docker compose -f tests/resources/docker/${dockerComposeFile} up && exit %%ERRORLEVEL%%"
                 } else {
-                    commandLine 'sh', '-c', "docker-compose -f tests/resources/docker/${dockerComposeFile} up -d"
+                    commandLine 'sh', '-c', "docker compose -f tests/resources/docker/${dockerComposeFile} up -d"
                 }
             }
         }
@@ -125,16 +125,16 @@ task stopRedisServer() {
         gradle.taskGraph.whenReady { graph ->
             if (graph.hasTask(":${packageName}-ballerina:test")) {
                 println("Stopping redis server...")
-                def dockerComposeFile = "docker-compose-standalone.yml"
+                def dockerComposeFile = "compose-standalone.yml"
                 if (System.getenv("TEST_CLUSTER_MODE")?.toBoolean()) {
-                    dockerComposeFile = "docker-compose-cluster.yml"
+                    dockerComposeFile = "compose-cluster.yml"
                 }
 
                 exec {
                     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                        commandLine 'cmd', '/c', "docker-compose -f tests/resources/docker/${dockerComposeFile} down && exit %%ERRORLEVEL%%"
+                        commandLine 'cmd', '/c', "docker compose -f tests/resources/docker/${dockerComposeFile} down && exit %%ERRORLEVEL%%"
                     } else {
-                        commandLine 'sh', '-c', "docker-compose -f tests/resources/docker/${dockerComposeFile} down"
+                        commandLine 'sh', '-c', "docker compose -f tests/resources/docker/${dockerComposeFile} down"
                     }
                 }
             }

diff --git a/...sources/docker/docker-compose-cluster.yml → ...ests/resources/docker/compose-cluster.yml b/...sources/docker/docker-compose-cluster.yml → ...ests/resources/docker/compose-cluster.yml
@@ -1,5 +1,3 @@
-version: '3.0'
-
 services:
   redis-cluster-node1:
     image: redis:7.2.2

diff --git a/...rces/docker/docker-compose-standalone.yml → ...s/resources/docker/compose-standalone.yml b/...rces/docker/docker-compose-standalone.yml → ...s/resources/docker/compose-standalone.yml
@@ -1,5 +1,3 @@
-version: '3.0'
-
 services:
   redis-standalone:
     image: redis:7.2.2

diff --git a/examples/rate-limiting/Redis rate limiting.md b/examples/rate-limiting/Redis rate limiting.md
@@ -11,7 +11,7 @@ Use the following command to start a Redis server using Docker. It will start th
 interact with Redis. 
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 Once you run the following command, you can access the RedisInsight web interface by navigating to

diff --git a/examples/rate-limiting/docker-compose.yml → examples/rate-limiting/compose.yml b/examples/rate-limiting/docker-compose.yml → examples/rate-limiting/compose.yml