From 110bc2ffe7ff29f510d90f7e38f745e558129619 Mon Sep 17 00:00:00 2001
From: chrislu <chris.lu@gmail.com>
Date: Wed, 27 Aug 2025 22:29:50 -0700
Subject: [PATCH] fix docker

---
 test/s3/iam/Dockerfile.debug        | 2 +-
 test/s3/iam/Dockerfile.s3           | 2 +-
 test/s3/iam/Makefile.docker         | 2 +-
 test/s3/iam/docker-compose.test.yml | 2 +-
 test/s3/iam/docker-compose.yml      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/s3/iam/Dockerfile.debug b/test/s3/iam/Dockerfile.debug
index 2d3120a76..2c9d5020e 100644
--- a/test/s3/iam/Dockerfile.debug
+++ b/test/s3/iam/Dockerfile.debug
@@ -1,5 +1,5 @@
 # Debug version of SeaweedFS with role mapping fixes
-FROM alpine:latest
+FROM alpine:3.18
 
 # Install required packages
 RUN apk add --no-cache \
diff --git a/test/s3/iam/Dockerfile.s3 b/test/s3/iam/Dockerfile.s3
index 36f0ead1f..597c5a820 100644
--- a/test/s3/iam/Dockerfile.s3
+++ b/test/s3/iam/Dockerfile.s3
@@ -14,7 +14,7 @@ COPY . .
 RUN cd weed && go build -o /usr/local/bin/weed
 
 # Final runtime image
-FROM alpine:latest
+FROM alpine:3.18
 
 # Install runtime dependencies
 RUN apk add --no-cache ca-certificates wget curl
diff --git a/test/s3/iam/Makefile.docker b/test/s3/iam/Makefile.docker
index df7465980..3548ed63e 100644
--- a/test/s3/iam/Makefile.docker
+++ b/test/s3/iam/Makefile.docker
@@ -152,7 +152,7 @@ docker-wait-healthy: ## Wait for all services to be healthy
 		while true; do \
 			all_healthy=true; \
 			for service in $$required_services; do \
-				if ! docker-compose -p $(PROJECT_NAME) -f $(COMPOSE_FILE) ps $$service | grep -q "healthy"; then \
+				if [ "$$(docker inspect -f '{{.State.Health.Status}}' $(PROJECT_NAME)-$${service}-1)" != "healthy" ]; then \
 					echo "Waiting for $$service to be healthy..."; \
 					all_healthy=false; \
 					break; \
diff --git a/test/s3/iam/docker-compose.test.yml b/test/s3/iam/docker-compose.test.yml
index e67703f3f..f1faddb93 100644
--- a/test/s3/iam/docker-compose.test.yml
+++ b/test/s3/iam/docker-compose.test.yml
@@ -134,7 +134,7 @@ services:
       PHPLDAPADMIN_LDAP_HOSTS: "ldap-server"
       PHPLDAPADMIN_HTTPS: "false"
     ports:
-      - "8080:80"
+      - "8081:80"
     depends_on:
       - ldap-server
     networks:
diff --git a/test/s3/iam/docker-compose.yml b/test/s3/iam/docker-compose.yml
index 58b334279..5caf96bb2 100644
--- a/test/s3/iam/docker-compose.yml
+++ b/test/s3/iam/docker-compose.yml
@@ -51,7 +51,7 @@ services:
     container_name: weed-volume
     hostname: weed-volume
     ports:
-      - "8080:8080"
+      - "8081:8080"
       - "18080:18080"
     command: "volume -ip=weed-volume -port=8080 -dir=/data -mserver=weed-master:9333 -dataCenter=dc1 -rack=rack1"
     volumes: