From 52af480bde363c8d2b3a9d08c9cf47be688cffb5 Mon Sep 17 00:00:00 2001
From: Yong <yongzheng0809@gmail.com>
Date: Sat, 24 Jan 2026 14:52:32 -0600
Subject: [PATCH 1/2] Switch mc/s3cmd to aws cli

---
 getting-started/ceph/docker-compose.yml   |  6 +++---
 getting-started/rustfs/README.md          |  3 ---
 getting-started/rustfs/docker-compose.yml | 10 ++++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/getting-started/ceph/docker-compose.yml b/getting-started/ceph/docker-compose.yml
index afecbdc786..e26252da25 100644
--- a/getting-started/ceph/docker-compose.yml
+++ b/getting-started/ceph/docker-compose.yml
@@ -128,14 +128,14 @@ services:
       - osd1
 
   setup_bucket:
-    image: peakcom/s5cmd:v2.3.0
+    image: amazon/aws-cli:2.33.6
     depends_on:
       - rgw1
     environment:
       AWS_ACCESS_KEY_ID: ${RGW_ACCESS_KEY}
       AWS_SECRET_ACCESS_KEY: ${RGW_SECRET_KEY}
       S3_ENDPOINT_URL: ${S3_ENDPOINT_URL}
-      S3_REGION: ${S3_REGION}
+      AWS_REGION: ${S3_REGION}
       S3_POLARIS_BUCKET: ${S3_POLARIS_BUCKET}
     entrypoint: "/bin/sh"
     command:
@@ -145,7 +145,7 @@ services:
         echo ">>> Waiting for RGW to become ready...";
         sleep 5;
         echo ">>> Create bucket if not exist...";
-        /s5cmd --endpoint-url ${S3_ENDPOINT_URL} mb s3://${S3_POLARIS_BUCKET} || true;
+        aws --endpoint-url ${S3_ENDPOINT_URL} s3 mb s3://${S3_POLARIS_BUCKET} || true;
         tail -f /dev/null;
 
   polaris:
diff --git a/getting-started/rustfs/README.md b/getting-started/rustfs/README.md
index 54f9fbe30a..2ff60971a4 100644
--- a/getting-started/rustfs/README.md
+++ b/getting-started/rustfs/README.md
@@ -19,9 +19,6 @@
 
 # Getting Started with Apache Polaris and RustFS
 
-> [!WARNING]
-> Disclaimer: This getting-started example uses mc from MinIO OSS for local testing only. MinIO OSS is in maintenance mode, and MinIO container images may no longer receive updates or security fixes. For production setups, [rc](https://github.com/rustfs/cli) should be used.
-
 ## Overview
 
 This example uses [RustFS](https://rustfs.com/) as a storage provider with Polaris.
diff --git a/getting-started/rustfs/docker-compose.yml b/getting-started/rustfs/docker-compose.yml
index 31d02aee13..b94483609b 100644
--- a/getting-started/rustfs/docker-compose.yml
+++ b/getting-started/rustfs/docker-compose.yml
@@ -65,18 +65,20 @@ services:
       start_period: 10s
 
   setup_bucket:
-    image: quay.io/minio/mc:RELEASE.2025-08-13T08-35-41Z
+    image: amazon/aws-cli:2.33.6
     depends_on:
       rustfs:
         condition: service_healthy
+    environment:
+      AWS_ACCESS_KEY_ID: rustfsadmin
+      AWS_SECRET_ACCESS_KEY: rustfsadmin
     entrypoint: "/bin/sh"
     command:
       - "-c"
       - >-
         echo Creating RustFS bucket...;
-        mc alias set pol http://rustfs:9000 rustfsadmin rustfsadmin;
-        mc mb pol/bucket123;
-        mc ls pol;
+        aws --endpoint-url http://rustfs:9000 s3 mb s3://bucket123;
+        aws --endpoint-url http://rustfs:9000 s3 ls;
         echo Bucket setup complete.;
 
   polaris-setup:

From a3360f8e8443bff1916ac9f4bc63f94b5a9032b7 Mon Sep 17 00:00:00 2001
From: Yong <yongzheng0809@gmail.com>
Date: Sat, 24 Jan 2026 14:58:49 -0600
Subject: [PATCH 2/2] Switch mc/s3cmd to aws cli

---
 getting-started/ceph/docker-compose.yml   | 4 ++--
 getting-started/rustfs/docker-compose.yml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/getting-started/ceph/docker-compose.yml b/getting-started/ceph/docker-compose.yml
index e26252da25..5082abcf0a 100644
--- a/getting-started/ceph/docker-compose.yml
+++ b/getting-started/ceph/docker-compose.yml
@@ -134,7 +134,7 @@ services:
     environment:
       AWS_ACCESS_KEY_ID: ${RGW_ACCESS_KEY}
       AWS_SECRET_ACCESS_KEY: ${RGW_SECRET_KEY}
-      S3_ENDPOINT_URL: ${S3_ENDPOINT_URL}
+      AWS_ENDPOINT_URL: ${S3_ENDPOINT_URL}
       AWS_REGION: ${S3_REGION}
       S3_POLARIS_BUCKET: ${S3_POLARIS_BUCKET}
     entrypoint: "/bin/sh"
@@ -145,7 +145,7 @@ services:
         echo ">>> Waiting for RGW to become ready...";
         sleep 5;
         echo ">>> Create bucket if not exist...";
-        aws --endpoint-url ${S3_ENDPOINT_URL} s3 mb s3://${S3_POLARIS_BUCKET} || true;
+        aws s3 mb s3://${S3_POLARIS_BUCKET} || true;
         tail -f /dev/null;
 
   polaris:
diff --git a/getting-started/rustfs/docker-compose.yml b/getting-started/rustfs/docker-compose.yml
index b94483609b..82b8522215 100644
--- a/getting-started/rustfs/docker-compose.yml
+++ b/getting-started/rustfs/docker-compose.yml
@@ -72,13 +72,14 @@ services:
     environment:
       AWS_ACCESS_KEY_ID: rustfsadmin
       AWS_SECRET_ACCESS_KEY: rustfsadmin
+      AWS_ENDPOINT_URL: http://rustfs:9000
     entrypoint: "/bin/sh"
     command:
       - "-c"
       - >-
         echo Creating RustFS bucket...;
-        aws --endpoint-url http://rustfs:9000 s3 mb s3://bucket123;
-        aws --endpoint-url http://rustfs:9000 s3 ls;
+        aws s3 mb s3://bucket123;
+        aws s3 ls;
         echo Bucket setup complete.;
 
   polaris-setup: