From 8dc4c7cc8d4b5b90b8e9a3fc3931f5dd4f857d32 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Mon, 7 Sep 2026 21:16:00 +0200
Subject: [PATCH] Fix unavailable Google Cloud emulator image tags in tests

Replace unavailable emulator tags with 583.0.0-emulators to restore gcloud CI.
---
 .../gcloud/BigtableEmulatorContainerTest.java               | 2 +-
 .../gcloud/DatastoreEmulatorContainerTest.java              | 6 +++---
 .../gcloud/FirestoreEmulatorContainerTest.java              | 4 ++--
 .../testcontainers/gcloud/PubSubEmulatorContainerTest.java  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
index 64f19a42df5..43f25876326 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
@@ -39,7 +39,7 @@ void testSimple() throws IOException {
         try (
             // emulatorContainer {
             BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
-                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators")
             );
             // }
         ) {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
index dceec1af215..d3e7a01db5c 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
@@ -21,7 +21,7 @@ public void testSimple() {
         try (
             // creatingDatastoreEmulatorContainer {
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators")
             );
             // }
         ) {
@@ -49,7 +49,7 @@ public void testSimple() {
     void testWithFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators"
             )
                 .withFlags("--consistency 1.0")
         ) {
@@ -64,7 +64,7 @@ void testWithFlags() throws IOException, InterruptedException {
     void testWithMultipleFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators"
             )
                 .withFlags("--consistency 1.0 --data-dir /root/.config/test-gcloud")
         ) {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
index 2c3233388aa..ca1da0c2892 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
@@ -25,7 +25,7 @@ void testSimple() throws ExecutionException, InterruptedException {
         try (
             // emulatorContainer {
             FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators")
             );
             // }
         ) {
@@ -60,7 +60,7 @@ void testSimple() throws ExecutionException, InterruptedException {
     void testWithFlags() {
         try (
             FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/google-cloud-cli:465.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators"
             )
                 .withFlags("--database-mode datastore-mode")
         ) {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
index eb3ed0260ee..54d557d9de9 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
@@ -39,7 +39,7 @@ void testSimple() throws IOException {
         try (
             // emulatorContainer {
             PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
-                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:583.0.0-emulators")
             );
             // }
         ) {