From ede9d8417a200198eb101bdc82afe35b2728ba52 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 15 Sep 2026 23:00:45 +0200
Subject: [PATCH] build(minio): use packaged mx client in development images

---
 docker-compose-maxio.dev.yml            |  4 ++--
 docker-compose.dev-multi.yml            |  2 +-
 docker-compose.dev.yml                  |  2 +-
 docker/development/Dockerfile           |  2 +-
 tests/Unit/MinioClientPackagingTest.php | 22 ++++++++++++++--------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/docker-compose-maxio.dev.yml b/docker-compose-maxio.dev.yml
index b429244166..885d17f3c8 100644
--- a/docker-compose-maxio.dev.yml
+++ b/docker-compose-maxio.dev.yml
@@ -162,7 +162,7 @@ services:
     networks:
       - coolify
   # maxio-init:
-  #   image: quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z
+  #   image: ghcr.io/coollabsio/mx:0.1.0
   #   pull_policy: always
   #   container_name: coolify-maxio-init
   #   restart: no
@@ -182,7 +182,7 @@ services:
   #   networks:
   #     - coolify
   minio-init:
-    image: quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z
+    image: ghcr.io/coollabsio/mx:0.1.0
     pull_policy: always
     container_name: coolify-minio-init
     restart: no
diff --git a/docker-compose.dev-multi.yml b/docker-compose.dev-multi.yml
index 31908436f4..c8f2833117 100644
--- a/docker-compose.dev-multi.yml
+++ b/docker-compose.dev-multi.yml
@@ -195,7 +195,7 @@ services:
 
   minio-init:
     profiles: ["minio"]
-    image: quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z
+    image: ghcr.io/coollabsio/mx:0.1.0
     pull_policy: always
     restart: "no"
     depends_on:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 869a059c94..d33d9aab5c 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -150,7 +150,7 @@ services:
     networks:
       - coolify
   minio-init:
-    image: quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z
+    image: ghcr.io/coollabsio/mx:0.1.0
     pull_policy: always
     container_name: coolify-minio-init
     restart: no
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index e0df74b220..62bb0ee241 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -12,7 +12,7 @@ ARG NGINX_VERSION=1.31.2-r1
 # =================================================================
 # Get MinIO client
 # =================================================================
-FROM quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z AS minio-client
+FROM ghcr.io/coollabsio/mx:0.1.0 AS minio-client
 
 # =================================================================
 # Final Stage: Production image
diff --git a/tests/Unit/MinioClientPackagingTest.php b/tests/Unit/MinioClientPackagingTest.php
index d5e029601b..569759a11f 100644
--- a/tests/Unit/MinioClientPackagingTest.php
+++ b/tests/Unit/MinioClientPackagingTest.php
@@ -1,21 +1,27 @@
 <?php
 
-it('pins the AIStor MinIO client release in every Coolify image', function () {
-    $imageFiles = [
-        dirname(__DIR__, 2).'/docker/production/Dockerfile',
+it('uses the mx MinIO-compatible client in development', function () {
+    $developmentFiles = [
         dirname(__DIR__, 2).'/docker/development/Dockerfile',
-        dirname(__DIR__, 2).'/docker/coolify-helper/Dockerfile',
         dirname(__DIR__, 2).'/docker-compose.dev.yml',
         dirname(__DIR__, 2).'/docker-compose.dev-multi.yml',
         dirname(__DIR__, 2).'/docker-compose-maxio.dev.yml',
     ];
 
-    foreach ($imageFiles as $imageFile) {
-        $contents = file_get_contents($imageFile);
+    foreach ($developmentFiles as $developmentFile) {
+        $contents = file_get_contents($developmentFile);
 
         expect($contents)
-            ->toContain('quay.io/minio/aistor/mc:RELEASE.2026-09-06T02-44-40Z')
-            ->not->toContain('quay.io/minio/aistor/mc:latest')
+            ->toContain('ghcr.io/coollabsio/mx:0.1.0')
+            ->not->toContain('quay.io/minio/aistor/mc:')
             ->not->toContain('minio/mc:');
     }
 });
+
+it('keeps the mc command path when packaging mx', function () {
+    $dockerfile = file_get_contents(dirname(__DIR__, 2).'/docker/development/Dockerfile');
+
+    expect($dockerfile)
+        ->toContain('COPY --from=minio-client /usr/bin/mc /usr/bin/mc')
+        ->not->toContain('COPY --from=minio-client /usr/bin/mx');
+});