From 5969b0f393b724c9ed2147272d87a24c8d9efe1c Mon Sep 17 00:00:00 2001
From: Thomas Vitale <ThomasVitale@users.noreply.github.com>
Date: Fri, 5 Apr 2024 07:53:50 +0200
Subject: [PATCH] Weaviate: Support new container registry (#8512)

Fixes gh-8511

Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
---
 .../org/testcontainers/weaviate/WeaviateContainer.java | 10 +++++++---
 .../testcontainers/weaviate/WeaviateContainerTest.java |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
index c8920a4cfb9..6225c79dd4a 100644
--- a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -6,7 +6,7 @@
 /**
  * Testcontainers implementation of Weaviate.
  * <p>
- * Supported image: {@code semitechnologies/weaviate}
+ * Supported images: {@code cr.weaviate.io/semitechnologies/weaviate}, {@code semitechnologies/weaviate}
  * <p>
  * Exposed ports:
  * <ul>
@@ -16,7 +16,11 @@
  */
 public class WeaviateContainer extends GenericContainer<WeaviateContainer> {
 
-    private static final String WEAVIATE_IMAGE = "semitechnologies/weaviate";
+    private static final DockerImageName DEFAULT_WEAVIATE_IMAGE = DockerImageName.parse(
+        "cr.weaviate.io/semitechnologies/weaviate"
+    );
+
+    private static final DockerImageName DOCKER_HUB_WEAVIATE_IMAGE = DockerImageName.parse("semitechnologies/weaviate");
 
     public WeaviateContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
@@ -24,7 +28,7 @@ public WeaviateContainer(String dockerImageName) {
 
     public WeaviateContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DockerImageName.parse(WEAVIATE_IMAGE));
+        dockerImageName.assertCompatibleWith(DEFAULT_WEAVIATE_IMAGE, DOCKER_HUB_WEAVIATE_IMAGE);
         withExposedPorts(8080, 50051);
         withEnv("AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED", "true");
         withEnv("PERSISTENCE_DATA_PATH", "/var/lib/weaviate");
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 4acaa3b98fd..c74c6454d0d 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -19,7 +19,7 @@ public class WeaviateContainerTest {
     @Test
     public void testWeaviate() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.5")
+            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.24.5")
             // }
         ) {
             weaviate.start();