From e8234a95ae23eabc9f613eeea05604eb0a7c2143 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:36:23 +0100 Subject: [PATCH] Use "Runtime" as Docker image and service names; Runtime 1.1.27 (#1895) * Use image name kalix-runtime (was kalix-proxy) * Adapt Runtime version updating helpers * Rename Docker compose services * Kalix Runtime 1.1.25 * More safe renames * Missed a few versions * Service name in DockerComposeUtilsSpec * Found even more, sigh * Make TestContainers wait for the new message * Use Runtime 1.1.26 * some more proxy > runtime renaming * Kalix Runtime 1.1.27 * delegate from old update script name * typo --------- Co-authored-by: Renato Cavalcanti --- build.sbt | 18 ++++++------- .../devtools/impl/DevModeSettingsSpec.scala | 4 +-- .../impl/DockerComposeUtilsSpec.scala | 16 ++++++------ .../modules/java/pages/access-control.adoc | 4 +-- .../archetype-resources/docker-compose.yml | 6 ++--- .../archetype-resources/docker-compose.yml | 6 ++--- .../archetype-resources/docker-compose.yml | 6 ++--- .../archetype-resources/docker-compose.yml | 6 ++--- project/Dependencies.scala | 15 ++++++----- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 4 +-- .../docker-compose-integration.yml | 10 +++---- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 2 +- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../docker-compose-integration.yml | 10 +++---- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../java-spring-view-store/docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../docker-compose-integration.yml | 10 +++---- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 4 +-- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../docker-compose.yml | 6 ++--- .../javasdk/testkit/KalixProxyContainer.java | 8 +++--- .../kalix/javasdk/impl/ProxyInfoHolder.scala | 6 ++--- .../scala/kalix/javasdk/KalixRunnerSpec.scala | 6 ++--- .../docker-compose-integration.yml | 6 ++--- .../test/java/kalix/javasdk/tck/RunTck.java | 2 +- .../test/java/kalix/javasdk/tck/RunTck.java | 2 +- updateProxyVersions.sh | 26 ++----------------- updateRuntimeVersions.sh | 26 +++++++++++++++++++ 71 files changed, 244 insertions(+), 237 deletions(-) mode change 100755 => 100644 updateProxyVersions.sh create mode 100755 updateRuntimeVersions.sh diff --git a/build.sbt b/build.sbt index d279d31d8e..d7407e5aa9 100644 --- a/build.sbt +++ b/build.sbt @@ -102,8 +102,8 @@ lazy val javaSdkProtobufTestKit = project buildInfoKeys := Seq[BuildInfoKey]( name, version, - "proxyImage" -> "gcr.io/kalix-public/kalix-proxy", - "proxyVersion" -> Kalix.ProxyVersion, + "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime", + "runtimeVersion" -> Kalix.RuntimeVersion, "scalaVersion" -> scalaVersion.value), buildInfoPackage := "kalix.javasdk.testkit", // Generate javadocs by just including non generated Java sources @@ -182,8 +182,8 @@ lazy val javaSdkSpringTestKit = project buildInfoKeys := Seq[BuildInfoKey]( name, version, - "proxyImage" -> "gcr.io/kalix-public/kalix-proxy", - "proxyVersion" -> Kalix.ProxyVersion, + "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime", + "runtimeVersion" -> Kalix.RuntimeVersion, "scalaVersion" -> scalaVersion.value), buildInfoPackage := "kalix.spring.testkit", // Generate javadocs by just including non generated Java sources @@ -254,8 +254,8 @@ lazy val springBootStarterTest = project buildInfoKeys := Seq[BuildInfoKey]( name, version, - "proxyImage" -> "gcr.io/kalix-public/kalix-proxy", - "proxyVersion" -> Kalix.ProxyVersion, + "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime", + "runtimeVersion" -> Kalix.RuntimeVersion, "scalaVersion" -> scalaVersion.value), buildInfoPackage := "kalix.spring.boot.test", // Generate javadocs by just including non generated Java sources @@ -384,8 +384,8 @@ def devToolsCommon(project: Project): Project = buildInfoKeys := Seq[BuildInfoKey]( name, version, - "proxyImage" -> "gcr.io/kalix-public/kalix-proxy", - "proxyVersion" -> Kalix.ProxyVersion), + "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime", + "runtimeVersion" -> Kalix.RuntimeVersion), buildInfoPackage := "kalix.devtools", // Generate javadocs by just including non generated Java sources Compile / doc / sources := { @@ -517,7 +517,7 @@ lazy val codegenScala = version, scalaVersion, sbtVersion, - "protocolVersion" -> Kalix.ProxyVersion, + "protocolVersion" -> Kalix.RuntimeVersion, BuildInfoKey(PB.protocExecutable), BuildInfoKey(codegenCore / PB.externalIncludePath), BuildInfoKey(codegenCore / PB.externalSourcePath), diff --git a/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala b/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala index 9a2871e3be..92d0a46869 100644 --- a/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala +++ b/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala @@ -27,8 +27,8 @@ object DevModeSettingsSpec { """ |version: "3" |services: - | kalix-proxy: - | image: gcr.io/kalix-public/kalix-proxy:1.1.13 + | kalix-runtime: + | image: gcr.io/kalix-public/kalix-runtime:1.1.27 | ports: | - "9000:9000" | extra_hosts: diff --git a/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala b/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala index 7ca9ed93ae..57bc88c368 100644 --- a/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala +++ b/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala @@ -34,8 +34,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues """ |version: "3" |services: - | kalix-proxy: - | image: gcr.io/kalix-public/kalix-proxy:1.1.13 + | kalix-runtime: + | image: gcr.io/kalix-public/kalix-runtime:1.1.27 | ports: | - "9000:9000" | extra_hosts: @@ -70,8 +70,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues """ |version: "3" |services: - | kalix-proxy: - | image: gcr.io/kalix-public/kalix-proxy:1.1.8 + | kalix-runtime: + | image: gcr.io/kalix-public/kalix-runtime:1.1.27 | ports: | - "9000:9000" | extra_hosts: @@ -87,8 +87,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues """ |version: "3" |services: - | kalix-proxy: - | image: gcr.io/kalix-public/kalix-proxy:1.1.8 + | kalix-runtime: + | image: gcr.io/kalix-public/kalix-runtime:1.1.27 | ports: | - "9000:9000" | extra_hosts: @@ -119,8 +119,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues val extraProxy = """ - | kalix-proxy-2: - | image: gcr.io/kalix-public/kalix-proxy:1.1.8 + | kalix-runtime-2: + | image: gcr.io/kalix-public/kalix-runtime:1.1.27 | ports: | - "9000:9000" | extra_hosts: diff --git a/docs/src/modules/java/pages/access-control.adoc b/docs/src/modules/java/pages/access-control.adoc index f5af3e864a..ac49898292 100644 --- a/docs/src/modules/java/pages/access-control.adoc +++ b/docs/src/modules/java/pages/access-control.adoc @@ -123,7 +123,7 @@ When running a service during local development, it may be useful to enable ACL ```yaml kalix-runtime: - image: gcr.io/kalix-public/kalix-proxy:latest + image: gcr.io/kalix-public/kalix-runtime:latest ports: - "9000:9000" environment: @@ -140,7 +140,7 @@ If running multiple services in local development, you may want to run with ACLs ```yaml kalix-runtime: - image: gcr.io/kalix-public/kalix-proxy:latest + image: gcr.io/kalix-public/kalix-runtime:latest ports: - "9000:9000" environment: diff --git a/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml index 32829934a4..656cd11ba2 100644 --- a/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -1,11 +1,11 @@ #[[ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: ]]#${artifactId}#[[ ports: - "9000:9000" diff --git a/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml index 32829934a4..656cd11ba2 100644 --- a/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -1,11 +1,11 @@ #[[ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: ]]#${artifactId}#[[ ports: - "9000:9000" diff --git a/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml index 32829934a4..656cd11ba2 100644 --- a/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml @@ -1,11 +1,11 @@ #[[ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: ]]#${artifactId}#[[ ports: - "9000:9000" diff --git a/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml index 32829934a4..656cd11ba2 100644 --- a/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml @@ -1,11 +1,11 @@ #[[ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: ]]#${artifactId}#[[ ports: - "9000:9000" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e47e4e5209..c9f0fd1d93 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,10 @@ object Dependencies { object Kalix { val ProtocolVersionMajor = 1 val ProtocolVersionMinor = 1 - val ProxyVersion = System.getProperty("kalix-proxy.version", "1.1.26") + val RuntimeVersion = System.getProperty( + "kalix-runtime.version", + // temporarily accept the old system property name + System.getProperty("kalix-proxy.version", "1.1.27")) } // changing the Scala version of the Java SDK affects end users @@ -36,10 +39,10 @@ object Dependencies { val CommonsIoVersion = "2.11.0" val MunitVersion = "0.7.29" - val kalixProxyProtocol = "io.kalix" % "kalix-proxy-protocol" % Kalix.ProxyVersion - val kalixSdkProtocol = "io.kalix" % "kalix-sdk-protocol" % Kalix.ProxyVersion - val kalixTckProtocol = "io.kalix" % "kalix-tck-protocol" % Kalix.ProxyVersion - val kalixTestkitProtocol = "io.kalix" % "kalix-testkit-protocol" % Kalix.ProxyVersion + val kalixProxyProtocol = "io.kalix" % "kalix-proxy-protocol" % Kalix.RuntimeVersion + val kalixSdkProtocol = "io.kalix" % "kalix-sdk-protocol" % Kalix.RuntimeVersion + val kalixTckProtocol = "io.kalix" % "kalix-tck-protocol" % Kalix.RuntimeVersion + val kalixTestkitProtocol = "io.kalix" % "kalix-testkit-protocol" % Kalix.RuntimeVersion val commonsIo = "commons-io" % "commons-io" % CommonsIoVersion val logback = "ch.qos.logback" % "logback-classic" % LogbackVersion @@ -174,7 +177,7 @@ object Dependencies { // Eventually, the final form of protos from should be backported to the framework. // See https://github.com/lightbend/kalix-jvm-sdk/issues/605 // kalixTckProtocol % "protobuf-src", - // "io.kalix" % "kalix-tck-protocol" % Kalix.ProxyVersion % "protobuf-src", + // "io.kalix" % "kalix-tck-protocol" % Kalix.RuntimeVersion % "protobuf-src", logback) val codegenCore = deps ++= Seq( diff --git a/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml index 38057c89d0..ad0c768d46 100644 --- a/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-customer-registry-kafka-quickstart ports: - "9000:9000" @@ -25,7 +25,7 @@ services: environment: KAFKA_BROKER_ID: 1 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - # advertised listener running on port 9092 must be accessible to kalix-proxy container running for integration tests + # advertised listener running on port 9092 must be accessible to kalix-runtime service running for integration tests # therefore we need to use host.docker.internal (docker's bridge address) to access it through the host machine # advertised listener running on port 9093 is to be used by non-docker clients running on host machine KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:29092,EXTERNAL_DOCKER://host.docker.internal:9092,HOST://localhost:9093 diff --git a/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml index 3b14bc4e37..bcae4c744d 100644 --- a/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-customer-registry-quickstart ports: - "9000:9000" diff --git a/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml index 66d0672be9..5e12472528 100644 --- a/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-customer-registry-views-quickstart ports: - "9000:9000" diff --git a/samples/java-protobuf-eventsourced-counter/docker-compose.yml b/samples/java-protobuf-eventsourced-counter/docker-compose.yml index 3c3fcac27d..bca5db1cff 100644 --- a/samples/java-protobuf-eventsourced-counter/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-counter ports: - "9000:9000" diff --git a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index b4df0a191a..6fec344ffc 100644 --- a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -4,11 +4,11 @@ #tag::customer-registry-docker[] version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-customer-registry-subscriber depends_on: - - kalix-proxy-customer-registry + - kalix-runtime-customer-registry ports: - "9001:9000" extra_hosts: @@ -19,8 +19,8 @@ services: USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: "8081" - kalix-proxy-customer-registry: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime-customer-registry: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml index d304792d70..60f977b8e1 100644 --- a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -5,8 +5,8 @@ services: # note the ports being different from other sample docker-compose files to allow this service to run # on the same local machine as the java-protobuf-eventsourced-customer-registry #tag::customer-registry-subscriber[] - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-customer-registry-subscriber ports: - "9001:9000" @@ -17,4 +17,4 @@ services: -Dkalix.dev-mode.service-port-mappings.customer-registry=host.docker.internal:9000 USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: "8081" -#end::customer-registry-subscriber[] \ No newline at end of file +#end::customer-registry-subscriber[] diff --git a/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml index e477fff32b..37da40c12d 100644 --- a/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml @@ -1,8 +1,8 @@ #tag::customer-registry[] version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-customer-registry ports: - "9000:9000" @@ -14,4 +14,4 @@ services: USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} -#end::customer-registry[] \ No newline at end of file +#end::customer-registry[] diff --git a/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml b/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml index cfa070e385..49d5ee41ec 100644 --- a/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-eventsourced-shopping-cart ports: - "9000:9000" diff --git a/samples/java-protobuf-fibonacci-action/docker-compose.yml b/samples/java-protobuf-fibonacci-action/docker-compose.yml index 7a0794224d..e7e683753a 100644 --- a/samples/java-protobuf-fibonacci-action/docker-compose.yml +++ b/samples/java-protobuf-fibonacci-action/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-fibonacci-action ports: - "9000:9000" diff --git a/samples/java-protobuf-first-service/docker-compose.yml b/samples/java-protobuf-first-service/docker-compose.yml index e71f12896e..dcfc71b4bc 100644 --- a/samples/java-protobuf-first-service/docker-compose.yml +++ b/samples/java-protobuf-first-service/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-first-service ports: - "9000:9000" diff --git a/samples/java-protobuf-reliable-timers/docker-compose.yml b/samples/java-protobuf-reliable-timers/docker-compose.yml index fe47e93615..e588c6f775 100644 --- a/samples/java-protobuf-reliable-timers/docker-compose.yml +++ b/samples/java-protobuf-reliable-timers/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-reliable-timers ports: - "9000:9000" diff --git a/samples/java-protobuf-replicatedentity-examples/docker-compose.yml b/samples/java-protobuf-replicatedentity-examples/docker-compose.yml index 28d2ba4446..9402976988 100644 --- a/samples/java-protobuf-replicatedentity-examples/docker-compose.yml +++ b/samples/java-protobuf-replicatedentity-examples/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-replicatedentity-examples ports: - "9000:9000" diff --git a/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml b/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml index 2058565e60..53275df56c 100644 --- a/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-replicatedentity-shopping-cart ports: - "9000:9000" diff --git a/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml b/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml index a5b9e86d2e..d40f8a876b 100644 --- a/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml +++ b/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-shopping-cart-quickstart ports: - "9000:9000" diff --git a/samples/java-protobuf-valueentity-counter/docker-compose.yml b/samples/java-protobuf-valueentity-counter/docker-compose.yml index 22f273cef9..4c9241ac5f 100644 --- a/samples/java-protobuf-valueentity-counter/docker-compose.yml +++ b/samples/java-protobuf-valueentity-counter/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-valueentity-counter ports: - "9000:9000" diff --git a/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml b/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml index 9ce7c6e6e9..2446be2109 100644 --- a/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml +++ b/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-valueentity-customer-registry ports: - "9000:9000" diff --git a/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml b/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml index 0531a243a9..127fc6a9fb 100644 --- a/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-valueentity-shopping-cart ports: - "9000:9000" diff --git a/samples/java-protobuf-view-store/docker-compose.yml b/samples/java-protobuf-view-store/docker-compose.yml index d740bac83a..9f9e260c7c 100644 --- a/samples/java-protobuf-view-store/docker-compose.yml +++ b/samples/java-protobuf-view-store/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-view-store ports: - "9000:9000" diff --git a/samples/java-protobuf-web-resources/docker-compose.yml b/samples/java-protobuf-web-resources/docker-compose.yml index 9772da2490..c5c5779a20 100644 --- a/samples/java-protobuf-web-resources/docker-compose.yml +++ b/samples/java-protobuf-web-resources/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-protobuf-web-resources ports: - "9000:9000" @@ -12,4 +12,4 @@ services: # jvm -D properties can be added under this environment map (note: remove this comment when adding properties) USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} - USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} \ No newline at end of file + USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} diff --git a/samples/java-spring-choreography-saga-quickstart/docker-compose.yml b/samples/java-spring-choreography-saga-quickstart/docker-compose.yml index a87321240c..031da81780 100644 --- a/samples/java-spring-choreography-saga-quickstart/docker-compose.yml +++ b/samples/java-spring-choreography-saga-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + image: gcr.io/kalix-public/kalix-proxy:1.1.27 container_name: java-spring-choreography-saga-quickstart ports: - "9000:9000" diff --git a/samples/java-spring-customer-registry-quickstart/docker-compose.yml b/samples/java-spring-customer-registry-quickstart/docker-compose.yml index 7f1e775841..ea1dc843f7 100644 --- a/samples/java-spring-customer-registry-quickstart/docker-compose.yml +++ b/samples/java-spring-customer-registry-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-customer-registry-quickstart ports: - "9000:9000" diff --git a/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml b/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml index ead1f5d3cb..2f973de12f 100644 --- a/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml +++ b/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-customer-registry-views-quickstart ports: - "9000:9000" diff --git a/samples/java-spring-doc-snippets/docker-compose.yml b/samples/java-spring-doc-snippets/docker-compose.yml index 28225689a0..345555b29e 100644 --- a/samples/java-spring-doc-snippets/docker-compose.yml +++ b/samples/java-spring-doc-snippets/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 ports: - "9000:9000" extra_hosts: diff --git a/samples/java-spring-eventsourced-counter/docker-compose.yml b/samples/java-spring-eventsourced-counter/docker-compose.yml index df721ea81b..5454ef1a76 100644 --- a/samples/java-spring-eventsourced-counter/docker-compose.yml +++ b/samples/java-spring-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-counter ports: - "9000:9000" diff --git a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index d18e08153f..65a8e24fa2 100644 --- a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -4,11 +4,11 @@ #tag::customer-registry-docker[] version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-customer-registry-subscriber depends_on: - - kalix-proxy-customer-registry + - kalix-runtime-customer-registry ports: - "9001:9000" extra_hosts: @@ -19,8 +19,8 @@ services: USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: "8081" - kalix-proxy-customer-registry: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime-customer-registry: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml index 4588d1a1ce..6c1e406ac5 100644 --- a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -3,8 +3,8 @@ #tag::customer-registry-subscriber[] version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-customer-registry-subscriber ports: - "9001:9000" @@ -15,4 +15,4 @@ services: -Dkalix.dev-mode.service-port-mappings.customer-registry=host.docker.internal:9000 USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: "8081" -#end::customer-registry-subscriber[] \ No newline at end of file +#end::customer-registry-subscriber[] diff --git a/samples/java-spring-eventsourced-customer-registry/docker-compose.yml b/samples/java-spring-eventsourced-customer-registry/docker-compose.yml index c40d023a14..e0d8fa6893 100644 --- a/samples/java-spring-eventsourced-customer-registry/docker-compose.yml +++ b/samples/java-spring-eventsourced-customer-registry/docker-compose.yml @@ -1,8 +1,8 @@ #tag::customer-registry[] version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-customer-registry ports: - "9000:9000" @@ -14,4 +14,4 @@ services: USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} -#end::customer-registry[] \ No newline at end of file +#end::customer-registry[] diff --git a/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml b/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml index 7eca33affd..269bf7dfd9 100644 --- a/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-eventsourced-shopping-cart ports: - "9000:9000" diff --git a/samples/java-spring-fibonacci-action/docker-compose.yml b/samples/java-spring-fibonacci-action/docker-compose.yml index 8c810ff6fd..ea2b700100 100644 --- a/samples/java-spring-fibonacci-action/docker-compose.yml +++ b/samples/java-spring-fibonacci-action/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-fibonacci-action ports: - "9000:9000" diff --git a/samples/java-spring-reliable-timers/docker-compose.yml b/samples/java-spring-reliable-timers/docker-compose.yml index 4aaa7333a4..1c7fe3c222 100644 --- a/samples/java-spring-reliable-timers/docker-compose.yml +++ b/samples/java-spring-reliable-timers/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-reliable-timers ports: - "9000:9000" diff --git a/samples/java-spring-shopping-cart-quickstart/docker-compose.yml b/samples/java-spring-shopping-cart-quickstart/docker-compose.yml index 3259a211f7..dfbb65ee37 100644 --- a/samples/java-spring-shopping-cart-quickstart/docker-compose.yml +++ b/samples/java-spring-shopping-cart-quickstart/docker-compose.yml @@ -1,11 +1,11 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-shopping-cart-quickstart ports: - "9000:9000" diff --git a/samples/java-spring-transfer-workflow-compensation/docker-compose.yml b/samples/java-spring-transfer-workflow-compensation/docker-compose.yml index 14d2a87398..3f4de4afd4 100644 --- a/samples/java-spring-transfer-workflow-compensation/docker-compose.yml +++ b/samples/java-spring-transfer-workflow-compensation/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-transfer-workflow-compensation ports: - "9000:9000" diff --git a/samples/java-spring-transfer-workflow/docker-compose.yml b/samples/java-spring-transfer-workflow/docker-compose.yml index 3ac94ad334..b150b99da7 100644 --- a/samples/java-spring-transfer-workflow/docker-compose.yml +++ b/samples/java-spring-transfer-workflow/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-transfer-workflow ports: - "9000:9000" diff --git a/samples/java-spring-valueentity-counter/docker-compose.yml b/samples/java-spring-valueentity-counter/docker-compose.yml index c410d56de5..590f1731ba 100644 --- a/samples/java-spring-valueentity-counter/docker-compose.yml +++ b/samples/java-spring-valueentity-counter/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-valueentity-counter ports: - "9000:9000" diff --git a/samples/java-spring-valueentity-customer-registry/docker-compose.yml b/samples/java-spring-valueentity-customer-registry/docker-compose.yml index b82753edf6..7a8a0f28c1 100644 --- a/samples/java-spring-valueentity-customer-registry/docker-compose.yml +++ b/samples/java-spring-valueentity-customer-registry/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-valueentity-customer-registry ports: - "9000:9000" diff --git a/samples/java-spring-valueentity-shopping-cart/docker-compose.yml b/samples/java-spring-valueentity-shopping-cart/docker-compose.yml index 577429f4fa..6fbc0b316f 100644 --- a/samples/java-spring-valueentity-shopping-cart/docker-compose.yml +++ b/samples/java-spring-valueentity-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-valueentity-shopping-cart ports: - "9000:9000" diff --git a/samples/java-spring-view-store/docker-compose.yml b/samples/java-spring-view-store/docker-compose.yml index ed0d6356da..28d57cb288 100644 --- a/samples/java-spring-view-store/docker-compose.yml +++ b/samples/java-spring-view-store/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: java-spring-view-store ports: - "9000:9000" diff --git a/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml b/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml index 25f0d8695a..6da21b1f5b 100644 --- a/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml +++ b/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-customer-registry-quickstart ports: - "9000:9000" diff --git a/samples/scala-protobuf-doc-snippets/docker-compose.yml b/samples/scala-protobuf-doc-snippets/docker-compose.yml index 1844873178..16c2903b77 100644 --- a/samples/scala-protobuf-doc-snippets/docker-compose.yml +++ b/samples/scala-protobuf-doc-snippets/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-doc-snippets depends_on: - gcloud-pubsub-emulator diff --git a/samples/scala-protobuf-eventsourced-counter/docker-compose.yml b/samples/scala-protobuf-eventsourced-counter/docker-compose.yml index 832a357220..2fb1d2b195 100644 --- a/samples/scala-protobuf-eventsourced-counter/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.26 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-counter ports: - "9000:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index 43852c4ed2..450b04007e 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -4,11 +4,11 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-customer-registry-subscriber depends_on: - - kalix-proxy-customer-registry + - kalix-runtime-customer-registry ports: - "9001:9000" extra_hosts: @@ -19,8 +19,8 @@ services: USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} USER_FUNCTION_PORT: "8081" - kalix-proxy-customer-registry: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime-customer-registry: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml index 5cbc75526c..40b6246ab9 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -2,8 +2,8 @@ version: "3" services: # note the ports being different from other sample docker-compose files to allow this service to run # on the same local machine as the scala-protobuf-eventsourced-customer-registry - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-customer-registry-subscriber ports: - "9001:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml b/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml index ad15170161..b0551c815d 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml b/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml index d8edafbff3..2b51eae2f2 100644 --- a/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-eventsourced-shopping-cart ports: - "9000:9000" diff --git a/samples/scala-protobuf-fibonacci-action/docker-compose.yml b/samples/scala-protobuf-fibonacci-action/docker-compose.yml index 44d925bb4d..75ef7deb06 100644 --- a/samples/scala-protobuf-fibonacci-action/docker-compose.yml +++ b/samples/scala-protobuf-fibonacci-action/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-fibonacci-action ports: - "9000:9000" diff --git a/samples/scala-protobuf-first-service/docker-compose.yml b/samples/scala-protobuf-first-service/docker-compose.yml index 5cae9ce856..85708f1d1c 100644 --- a/samples/scala-protobuf-first-service/docker-compose.yml +++ b/samples/scala-protobuf-first-service/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-first-service ports: - "9000:9000" diff --git a/samples/scala-protobuf-reliable-timers/docker-compose.yml b/samples/scala-protobuf-reliable-timers/docker-compose.yml index 70d6fae0c9..f719d743c5 100644 --- a/samples/scala-protobuf-reliable-timers/docker-compose.yml +++ b/samples/scala-protobuf-reliable-timers/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-reliable-timers ports: - "9000:9000" diff --git a/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml b/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml index 34809518ae..b492c2f255 100644 --- a/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml +++ b/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-replicatedentity-examples ports: - "9000:9000" diff --git a/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml b/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml index 1df0906653..153883c5f7 100644 --- a/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-replicatedentity-shopping-cart ports: - "9000:9000" diff --git a/samples/scala-protobuf-valueentity-counter/docker-compose.yml b/samples/scala-protobuf-valueentity-counter/docker-compose.yml index 2333d5f8c0..1c2900f0a5 100644 --- a/samples/scala-protobuf-valueentity-counter/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-counter/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-valueentity-counter ports: - "9000:9000" diff --git a/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml b/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml index fbcba2c208..e737a1f780 100644 --- a/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-valueentity-customer-registry ports: - "9000:9000" diff --git a/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml b/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml index 41ac096ebd..dc6253fa65 100644 --- a/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-valueentity-shopping-cart ports: - "9000:9000" diff --git a/samples/scala-protobuf-view-store/docker-compose.yml b/samples/scala-protobuf-view-store/docker-compose.yml index 1708eb5598..faf95e9d67 100644 --- a/samples/scala-protobuf-view-store/docker-compose.yml +++ b/samples/scala-protobuf-view-store/docker-compose.yml @@ -1,10 +1,10 @@ # If you're looking to use eventing with Google PubSub, to get an emulator running: -# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service +# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-view-store ports: - "9000:9000" diff --git a/samples/scala-protobuf-web-resources/docker-compose.yml b/samples/scala-protobuf-web-resources/docker-compose.yml index ffd4a978ae..6435457e06 100644 --- a/samples/scala-protobuf-web-resources/docker-compose.yml +++ b/samples/scala-protobuf-web-resources/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 container_name: scala-protobuf-web-resources ports: - "9000:9000" @@ -12,4 +12,4 @@ services: # jvm -D properties can be added under this environment map (note: remove this comment when adding properties) USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal} - USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} \ No newline at end of file + USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080} diff --git a/sdk/java-sdk-protobuf-testkit/src/main/java/kalix/javasdk/testkit/KalixProxyContainer.java b/sdk/java-sdk-protobuf-testkit/src/main/java/kalix/javasdk/testkit/KalixProxyContainer.java index 440d628b4e..58315b2ac2 100644 --- a/sdk/java-sdk-protobuf-testkit/src/main/java/kalix/javasdk/testkit/KalixProxyContainer.java +++ b/sdk/java-sdk-protobuf-testkit/src/main/java/kalix/javasdk/testkit/KalixProxyContainer.java @@ -48,11 +48,11 @@ public class KalixProxyContainer extends GenericContainer { static { String customImage = System.getenv("KALIX_TESTKIT_PROXY_IMAGE"); if (customImage == null) { - DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(BuildInfo.proxyImage()).withTag(BuildInfo.proxyVersion()); + DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(BuildInfo.runtimeImage()).withTag(BuildInfo.runtimeVersion()); } else { Logger logger = LoggerFactory.getLogger(KalixProxyContainer.class); DEFAULT_PROXY_IMAGE_NAME = DockerImageName.parse(customImage); - logger.info("Using custom proxy image [{}]", customImage); + logger.info("Using custom runtime image [{}]", customImage); } } @@ -88,7 +88,7 @@ public KalixProxyContainer( if ("false".equals(System.getenv("VERSION_CHECK_ON_STARTUP"))) { withEnv("VERSION_CHECK_ON_STARTUP", "false"); } - waitingFor(Wait.forLogMessage(".*gRPC proxy started.*", 1)); + waitingFor(Wait.forLogMessage(".*(gRPC proxy|Kalix Runtime) started.*", 1)); } @Override @@ -103,7 +103,7 @@ public void start() { super.start(); // Debug tooling: pass the Proxy logs into the client SLF4J if ("true".equals(System.getenv("KALIX_TESTKIT_DEBUG"))) { - Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LoggerFactory.getLogger("proxy-logs")); + Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LoggerFactory.getLogger("runtime-logs")); followOutput(logConsumer); } } diff --git a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/ProxyInfoHolder.scala b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/ProxyInfoHolder.scala index 6e4b2c6342..6260fb17ee 100644 --- a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/ProxyInfoHolder.scala +++ b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/ProxyInfoHolder.scala @@ -63,10 +63,10 @@ class ProxyInfoHolder(system: ExtendedActorSystem) extends Extension { _identificationInfo = proxyInfo.identificationInfo _proxyTracingCollectorEndpoint = Some(proxyInfo.tracingCollectorEndpoint) - log.debug("Proxy hostname: [{}]", chosenProxyName) - log.debug("Proxy port to: [{}]", proxyInfo.proxyPort) + log.debug("Runtime hostname: [{}]", chosenProxyName) + log.debug("Runtime port to: [{}]", proxyInfo.proxyPort) log.debug("Identification name: [{}]", proxyInfo.identificationInfo) - log.debug("Proxy Tracing collector endpoint: [{}]", proxyInfo.tracingCollectorEndpoint) + log.debug("Runtime Tracing collector endpoint: [{}]", proxyInfo.tracingCollectorEndpoint) } def proxyHostname: Option[String] = Option(_proxyHostname.get()) diff --git a/sdk/java-sdk-protobuf/src/test/scala/kalix/javasdk/KalixRunnerSpec.scala b/sdk/java-sdk-protobuf/src/test/scala/kalix/javasdk/KalixRunnerSpec.scala index 7ec02f9285..f791f085d5 100644 --- a/sdk/java-sdk-protobuf/src/test/scala/kalix/javasdk/KalixRunnerSpec.scala +++ b/sdk/java-sdk-protobuf/src/test/scala/kalix/javasdk/KalixRunnerSpec.scala @@ -30,7 +30,7 @@ class KalixRunnerSpec extends AnyWordSpec with Matchers { createTmpFile(s""" |version: "3" |services: - | kalix-proxy: + | kalix-runtime: | JAVA_TOOL_OPTIONS: > | -Dkalix.dev-mode.service-port-mappings.$mapping |""".stripMargin) @@ -121,8 +121,8 @@ class KalixRunnerSpec extends AnyWordSpec with Matchers { """ |version: "3" |services: - | kalix-proxy: - | image: gcr.io/kalix-public/kalix-proxy:1.1.8 + | kalix-runtime: + | image: gcr.io/kalix-public/kalix-runtime:1.1.24 | ports: | - "9000:9000" | extra_hosts: diff --git a/sdk/java-sdk-spring/docker-compose-integration.yml b/sdk/java-sdk-spring/docker-compose-integration.yml index 535409d3c1..7b11d54d21 100644 --- a/sdk/java-sdk-spring/docker-compose-integration.yml +++ b/sdk/java-sdk-spring/docker-compose-integration.yml @@ -1,7 +1,7 @@ version: "3" services: - kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.24 + kalix-runtime: + image: gcr.io/kalix-public/kalix-runtime:1.1.27 ports: - "9000:9000" extra_hosts: @@ -51,4 +51,4 @@ services: ports: - "16686:16686" # jaeger-ui depends_on: - - tempo \ No newline at end of file + - tempo diff --git a/tck/java-tck/src/test/java/kalix/javasdk/tck/RunTck.java b/tck/java-tck/src/test/java/kalix/javasdk/tck/RunTck.java index 962908795c..7f90a2a8a2 100644 --- a/tck/java-tck/src/test/java/kalix/javasdk/tck/RunTck.java +++ b/tck/java-tck/src/test/java/kalix/javasdk/tck/RunTck.java @@ -27,7 +27,7 @@ public final class RunTck { public static final String TCK_IMAGE = "gcr.io/kalix-public/kalix-tck"; - public static final String TCK_VERSION = BuildInfo.proxyVersion(); + public static final String TCK_VERSION = BuildInfo.runtimeVersion(); public static void main(String[] args) throws Exception { KalixRunner runner = JavaSdkTck.SERVICE.createRunner(); diff --git a/tck/scala-tck/src/test/java/kalix/javasdk/tck/RunTck.java b/tck/scala-tck/src/test/java/kalix/javasdk/tck/RunTck.java index a02d4f46b1..97869691fb 100644 --- a/tck/scala-tck/src/test/java/kalix/javasdk/tck/RunTck.java +++ b/tck/scala-tck/src/test/java/kalix/javasdk/tck/RunTck.java @@ -31,7 +31,7 @@ public final class RunTck { public static final String TCK_IMAGE = "gcr.io/kalix-public/kalix-tck"; - public static final String TCK_VERSION = BuildInfo.proxyVersion(); + public static final String TCK_VERSION = BuildInfo.runtimeVersion(); public static void main(String[] args) throws Exception { Kalix service = TckService.createService(); diff --git a/updateProxyVersions.sh b/updateProxyVersions.sh old mode 100755 new mode 100644 index cc716023f0..3700ff4af3 --- a/updateProxyVersions.sh +++ b/updateProxyVersions.sh @@ -1,26 +1,4 @@ #!/usr/bin/env bash +# delegating from the old script name -# USAGE: -# > PROXY_VERSION=1.0.31 ./updateProxyVersions.sh - -# this script is meant to be used after a new Proxy version is out -# to facilitate the update of all the places where we usually depend on the latest version - -# provide the new proxy version you want the project to be updated to -if [[ -z "$PROXY_VERSION" ]]; then - echo "Must provide PROXY_VERSION in environment" 1>&2 - exit 1 -fi - -echo ">>> Updating docker image versions to $PROXY_VERSION" -PROJS=$(find . -type f -name "docker-compose*.yml") -for i in ${PROJS[@]} -do - echo "Updating Dockerfile for: $i" - sed -i.bak "s/gcr.io\/kalix-public\/kalix-proxy:\(.*\)/gcr.io\/kalix-public\/kalix-proxy:$PROXY_VERSION/" $i - rm $i.bak -done - -echo ">>> Updating Dependencies.scala" -sed -i.bak "s/System.getProperty(\"kalix-proxy.version\", \"\(.*\)\")/System.getProperty(\"kalix-proxy.version\", \"$PROXY_VERSION\")/" ./project/Dependencies.scala -rm ./project/Dependencies.scala.bak +${PWD}/updateProxyVersions.sh diff --git a/updateRuntimeVersions.sh b/updateRuntimeVersions.sh new file mode 100755 index 0000000000..dd14b960c9 --- /dev/null +++ b/updateRuntimeVersions.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# USAGE: +# > RUNTIME_VERSION=1.0.31 ./updateRuntimeVersions.sh + +# this script is meant to be used after a new Kalix Runtime version is out +# to facilitate the update of all the places where we usually depend on the latest version + +# provide the new Kalix Runtime version you want the project to be updated to +if [[ -z "$RUNTIME_VERSION" ]]; then + echo "Must provide RUNTIME_VERSION in environment" 1>&2 + exit 1 +fi + +echo ">>> Updating docker image versions to $RUNTIME_VERSION" +PROJS=$(find . -type f -name "docker-compose*.yml") +for i in ${PROJS[@]} +do + echo "Updating Dockerfile for: $i" + sed -i.bak "s/gcr.io\/kalix-public\/kalix-runtime:\(.*\)/gcr.io\/kalix-public\/kalix-runtime:$RUNTIME_VERSION/" $i + rm $i.bak +done + +echo ">>> Updating Dependencies.scala" +sed -i.bak "s/System.getProperty(\"kalix-runtime.version\", \"\(.*\)\")/System.getProperty(\"kalix-runtime.version\", \"$RUNTIME_VERSION\")/" ./project/Dependencies.scala +rm ./project/Dependencies.scala.bak