From fcc79fa53f0f77708847e0639c431b25cb18f2cd Mon Sep 17 00:00:00 2001 From: Krishnananthalingam Tharmigan <63336800+TharmiganK@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:54:56 +0530 Subject: [PATCH 1/3] Update docker command --- ballerina-tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index 17f37b90d..9281ea7de 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -261,7 +261,7 @@ task startLdapServer() { if (!stdOut.toString().contains("openldap-server")) { println "Starting LDAP server." exec { - commandLine 'sh', '-c', "docker-compose -f $project.projectDir/resources/openldap/docker-compose.yml up -d" + commandLine 'sh', '-c', "docker compose -f $project.projectDir/resources/openldap/docker-compose.yml up -d" standardOutput = stdOut } println stdOut.toString() From dc1172fff2f4d5e66283149588996b8e2d30956d Mon Sep 17 00:00:00 2001 From: Krishnananthalingam Tharmigan <63336800+TharmiganK@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:27:01 +0530 Subject: [PATCH 2/3] Remove version and update file name --- .../resources/openldap/{docker-compose.yml => compose.yml} | 1 - 1 file changed, 1 deletion(-) rename ballerina-tests/resources/openldap/{docker-compose.yml => compose.yml} (97%) diff --git a/ballerina-tests/resources/openldap/docker-compose.yml b/ballerina-tests/resources/openldap/compose.yml similarity index 97% rename from ballerina-tests/resources/openldap/docker-compose.yml rename to ballerina-tests/resources/openldap/compose.yml index 63d25ce84..23599088b 100644 --- a/ballerina-tests/resources/openldap/docker-compose.yml +++ b/ballerina-tests/resources/openldap/compose.yml @@ -1,4 +1,3 @@ -version: '3.7' services: ldap_server: image: osixia/openldap:1.3.0 From b77cd394c95dfe4bf9856eed862dadac7928fa5c Mon Sep 17 00:00:00 2001 From: Krishnananthalingam Tharmigan <63336800+TharmiganK@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:28:11 +0530 Subject: [PATCH 3/3] Update file name --- ballerina-tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index 9281ea7de..439a60c2e 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -261,7 +261,7 @@ task startLdapServer() { if (!stdOut.toString().contains("openldap-server")) { println "Starting LDAP server." exec { - commandLine 'sh', '-c', "docker compose -f $project.projectDir/resources/openldap/docker-compose.yml up -d" + commandLine 'sh', '-c', "docker compose -f $project.projectDir/resources/openldap/compose.yml up -d" standardOutput = stdOut } println stdOut.toString()