Merge pull request #877 from aashikam/dockerv2

Update docker command to docker compose v2
ballerina-platform · Aug 5, 2024 · b804dc6 · b804dc6
2 parents 17acbae + c746f0f
commit b804dc6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle
@@ -111,7 +111,7 @@ task startNatsServersForTests() {
             if (!stdOut.toString().contains("server_nats-tls_1")) {
                 println "Starting NATS Basic server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml up -d"
+                    commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml up -d"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()
@@ -141,7 +141,7 @@ task stopNatsServersForTests() {
             if (stdOut.toString().contains("server_nats-tls_1")) {
                 println "Stopping NATS server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml rm -svf"
+                    commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml rm -svf"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()

diff --git a/...na-tests/tests/server/docker-compose.yaml → ballerina-tests/tests/server/compose.yaml b/...na-tests/tests/server/docker-compose.yaml → ballerina-tests/tests/server/compose.yaml
@@ -1,4 +1,3 @@
-version: "3"
 services:
     nats-tls:
         image: nats:latest

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerinax"
 name = "nats"
-version = "3.0.0"
+version = "3.0.1"
 authors = ["Ballerina"]
 keywords = ["service", "client", "messaging", "network", "pubsub"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-nats"
@@ -18,8 +18,8 @@ path = "./lib/jnats-2.16.0.jar"
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "nats-native"
-version = "3.0.0"
-path = "../native/build/libs/nats-native-3.0.0.jar"
+version = "3.0.1"
+path = "../native/build/libs/nats-native-3.0.1-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"

diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "nats-compiler-plugin"
 class = "io.ballerina.stdlib.nats.plugin.NatsCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.0.0.jar"
+path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.0.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -22,7 +22,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.7.0"
+version = "2.7.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
@@ -187,7 +187,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "nats"
-version = "3.0.0"
+version = "3.0.1"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "crypto"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -115,7 +115,7 @@ task startNatsServers() {
             if (!stdOut.toString().contains("server_nats-tls_1")) {
                 println "Starting NATS Basic server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml up -d"
+                    commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml up -d"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()
@@ -138,7 +138,7 @@ task stopNatsServers() {
             if (stdOut.toString().contains("server_nats-tls_1")) {
                 println "Stopping NATS server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml rm -svf"
+                    commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml rm -svf"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()

diff --git a/ballerina/tests/server/docker-compose.yaml → ballerina/tests/server/compose.yaml b/ballerina/tests/server/docker-compose.yaml → ballerina/tests/server/compose.yaml
@@ -1,4 +1,3 @@
-version: "3"
 services:
     nats-1:
         image: nats:latest