Merge pull request #1617 from DimuthuMadushan/docker

Update Docker Command to Docker Compose v2
ballerina-platform · Aug 2, 2024 · e10302d · e10302d
2 parents 7bb3966 + ad5a135
commit e10302d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle
@@ -207,7 +207,7 @@ task stopLdapServer() {
             if (stdOut.toString().contains("openldap-server")) {
                 println "Stopping LDAP server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/resources/openldap/docker-compose.yml rm -svf"
+                    commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml rm -svf"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()

diff --git a/...sts/resources/openldap/docker-compose.yml → ...ests/tests/resources/openldap/compose.yml b/...sts/resources/openldap/docker-compose.yml → ...ests/tests/resources/openldap/compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   ldap_server:
     image: osixia/openldap:1.3.0

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "grpc"
-version = "1.11.1"
+version = "1.11.2"
 distribution = "2201.9.0"
 authors = ["Ballerina"]
 keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"]
@@ -16,11 +16,11 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "grpc-native"
-version = "1.11.1"
-path = "../native/build/libs/grpc-native-1.11.1.jar"
+version = "1.11.2"
+path = "../native/build/libs/grpc-native-1.11.2-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
-path = "../test-utils/build/libs/grpc-test-utils-1.11.1.jar"
+path = "../test-utils/build/libs/grpc-test-utils-1.11.2-SNAPSHOT.jar"
 scope = "testOnly"
 
 [[platform.java17.dependency]]

diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "grpc-compiler-plugin"
 class = "io.ballerina.stdlib.grpc.plugin.GrpcCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.11.1.jar"
+path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.11.2-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -68,7 +68,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "grpc"
-version = "1.11.1"
+version = "1.11.2"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "crypto"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -236,7 +236,7 @@ task startLdapServer() {
             if (!stdOut.toString().contains("openldap-server")) {
                 println "Starting LDAP server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f tests/resources/openldap/docker-compose.yml up -d"
+                    commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml up -d"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()

diff --git a/...sts/resources/openldap/docker-compose.yml → ...rina/tests/resources/openldap/compose.yml b/...sts/resources/openldap/docker-compose.yml → ...rina/tests/resources/openldap/compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   ldap_server:
     image: osixia/openldap:1.3.0