Merge pull request #26 from aashikam/dockerv2

Update docker command to docker compose v2
ballerina-platform · Aug 7, 2024 · 44052c0 · 44052c0
2 parents 1ea76ee + bd908cd
commit 44052c0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerinax"
 name = "aws.redshift"
-version = "1.0.3"
+version = "1.0.4"
 authors = ["Ballerina"]
 keywords = ["Data Warehouse", "Columnar Storage", "Cost/Paid", "vendor/aws"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-aws.redshift"
@@ -15,8 +15,8 @@ graalvmCompatible = true
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "aws.redshift-native"
-version = "1.0.3"
-path = "../native/build/libs/aws.redshift-native-1.0.3.jar"
+version = "1.0.4-SNAPSHOT"
+path = "../native/build/libs/aws.redshift-native-1.0.4-SNAPSHOT.jar"
 
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -66,7 +66,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.13"
+version = "2.10.15"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -286,7 +286,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "sql"
-version = "1.12.1"
+version = "1.12.2"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -375,7 +375,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "aws.redshift"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "log"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -97,7 +97,7 @@ task startDatabaseServer() {
             if (!stdOut.toString().contains("server-redshift-1")) {
                 println "Starting Redshift 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()
@@ -120,7 +120,7 @@ task stopDatabaseServer() {
             if (stdOut.toString().contains("server-redshift-1")) {
                 println "Stopping RabbitMQ 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,5 +1,3 @@
-version: '3'
-
 services:
   redshift:
     image: ghcr.io/hearthsim/docker-pgredshift:latest