Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Docker Command to Docker Compose v2 #1617

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Update Docker Command to Docker Compose v2 #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8eaf0a
Update docker command to docker compose v2
DimuthuMadushan Aug 2, 2024
ad5a135
[Automated] Update the native jar versions
DimuthuMadushan Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ballerina-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion ...sts/resources/openldap/docker-compose.yml → ...ests/tests/resources/openldap/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
ldap_server:
image: osixia/openldap:1.3.0
Expand Down
8 changes: 4 additions & 4 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion ...sts/resources/openldap/docker-compose.yml → ...rina/tests/resources/openldap/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
ldap_server:
image: osixia/openldap:1.3.0
Expand Down
Loading