From a72b021b8a23d6c8a597152e8bb8244e4850571e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Sat, 17 Oct 2026 20:07:01 +0200
Subject: [PATCH 1/2] Support pgsty/silo image in MinIO module

minio/minio was removed from Docker Hub and quay.io no longer allows anonymous pulls, so the module's tests can no longer pull their image. Accept the community-maintained fork pgsty/silo (and its former name pgsty/minio) and use it in tests and docs.
---
 docs/modules/minio.md                                     | 5 +++++
 .../org/testcontainers/containers/MinIOContainer.java     | 8 ++++++--
 .../org/testcontainers/containers/MinIOContainerTest.java | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/modules/minio.md b/docs/modules/minio.md
index 165f760425c..5fe6fd86145 100644
--- a/docs/modules/minio.md
+++ b/docs/modules/minio.md
@@ -2,6 +2,11 @@
 
 Testcontainers can be used to automatically instantiate and manage [MinIO](https://min.io) containers.
 
+!!! note
+    The upstream `minio/minio` image is no longer published on Docker Hub. The module also accepts the community-maintained
+    fork [Silo](https://github.com/pgsty/silo) (`pgsty/silo`, formerly published as `pgsty/minio`), which is used in the
+    examples below.
+
 ## Usage example
 
 Create a `MinIOContainer` to use it in your tests:
diff --git a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
index dfd499194ef..fba8289f2b8 100644
--- a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
+++ b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
@@ -9,7 +9,7 @@
 /**
  * Testcontainers implementation for MinIO.
  * <p>
- * Supported image: {@code minio/minio}
+ * Supported images: {@code minio/minio}, {@code pgsty/silo}, {@code pgsty/minio}
  * <p>
  * Exposed ports:
  * <ul>
@@ -21,6 +21,10 @@ public class MinIOContainer extends GenericContainer<MinIOContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("minio/minio");
 
+    private static final DockerImageName SILO_IMAGE_NAME = DockerImageName.parse("pgsty/silo");
+
+    private static final DockerImageName PGSTY_IMAGE_NAME = DockerImageName.parse("pgsty/minio");
+
     private static final int MINIO_S3_PORT = 9000;
 
     private static final int MINIO_UI_PORT = 9001;
@@ -47,7 +51,7 @@ public MinIOContainer(final String dockerImageName) {
      */
     public MinIOContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, SILO_IMAGE_NAME, PGSTY_IMAGE_NAME);
         withExposedPorts(MINIO_S3_PORT, MINIO_UI_PORT);
         withCommand("server", "--console-address", ":" + MINIO_UI_PORT, "/data");
         waitingFor(
diff --git a/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
index 0998243de8e..8a60f8f9db2 100644
--- a/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
+++ b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
@@ -18,7 +18,7 @@ class MinIOContainerTest {
     void testBasicUsage() throws Exception {
         try (
             // minioContainer {
-            MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z");
+            MinIOContainer container = new MinIOContainer("pgsty/silo:RELEASE.2026-09-16T00-00-00Z");
             // }
         ) {
             container.start();
@@ -58,7 +58,7 @@ void testBasicUsage() throws Exception {
 
     @Test
     void testDefaultUserPassword() {
-        try (MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")) {
+        try (MinIOContainer container = new MinIOContainer("pgsty/silo:RELEASE.2026-09-16T00-00-00Z")) {
             container.start();
             assertThat(container.getUserName()).isEqualTo("minioadmin");
             assertThat(container.getPassword()).isEqualTo("minioadmin");
@@ -69,7 +69,7 @@ void testDefaultUserPassword() {
     void testOverwriteUserPassword() {
         try (
             // minioOverrides {
-            MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")
+            MinIOContainer container = new MinIOContainer("pgsty/silo:RELEASE.2026-09-16T00-00-00Z")
                 .withUserName("testuser")
                 .withPassword("testpassword");
             // }

From 28863716f81a4cdc8b8b58fc6d65526c492c030f Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Sat, 17 Oct 2026 20:18:32 +0200
Subject: [PATCH 2/2] Drop frozen pgsty/minio image and explain MinIO fork in
 docs

---
 docs/modules/minio.md                                     | 8 +++++---
 .../org/testcontainers/containers/MinIOContainer.java     | 6 ++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/modules/minio.md b/docs/modules/minio.md
index 5fe6fd86145..1fc8a125da1 100644
--- a/docs/modules/minio.md
+++ b/docs/modules/minio.md
@@ -3,9 +3,11 @@
 Testcontainers can be used to automatically instantiate and manage [MinIO](https://min.io) containers.
 
 !!! note
-    The upstream `minio/minio` image is no longer published on Docker Hub. The module also accepts the community-maintained
-    fork [Silo](https://github.com/pgsty/silo) (`pgsty/silo`, formerly published as `pgsty/minio`), which is used in the
-    examples below.
+    Upstream MinIO stopped publishing free community builds in late 2025 and archived the
+    [minio/minio](https://github.com/minio/minio) repository in 2026; the `minio/minio` image is no longer available on
+    Docker Hub. The module therefore also accepts [Silo](https://github.com/pgsty/silo) (`pgsty/silo`), a
+    community-maintained, AGPL-licensed fork of MinIO by the [Pigsty](https://pigsty.io) project, which is used in the
+    examples below. See the [Silo manifesto](https://silo.pigsty.io/about/manifesto/) for background on the fork.
 
 ## Usage example
 
diff --git a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
index fba8289f2b8..af1150e2ccf 100644
--- a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
+++ b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
@@ -9,7 +9,7 @@
 /**
  * Testcontainers implementation for MinIO.
  * <p>
- * Supported images: {@code minio/minio}, {@code pgsty/silo}, {@code pgsty/minio}
+ * Supported images: {@code minio/minio}, {@code pgsty/silo}
  * <p>
  * Exposed ports:
  * <ul>
@@ -23,8 +23,6 @@ public class MinIOContainer extends GenericContainer<MinIOContainer> {
 
     private static final DockerImageName SILO_IMAGE_NAME = DockerImageName.parse("pgsty/silo");
 
-    private static final DockerImageName PGSTY_IMAGE_NAME = DockerImageName.parse("pgsty/minio");
-
     private static final int MINIO_S3_PORT = 9000;
 
     private static final int MINIO_UI_PORT = 9001;
@@ -51,7 +49,7 @@ public MinIOContainer(final String dockerImageName) {
      */
     public MinIOContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, SILO_IMAGE_NAME, PGSTY_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, SILO_IMAGE_NAME);
         withExposedPorts(MINIO_S3_PORT, MINIO_UI_PORT);
         withCommand("server", "--console-address", ":" + MINIO_UI_PORT, "/data");
         waitingFor(