Browse Source

fix docker

pull/7160/head
chrislu 1 month ago
parent
commit
110bc2ffe7
  1. 2
      test/s3/iam/Dockerfile.debug
  2. 2
      test/s3/iam/Dockerfile.s3
  3. 2
      test/s3/iam/Makefile.docker
  4. 2
      test/s3/iam/docker-compose.test.yml
  5. 2
      test/s3/iam/docker-compose.yml

2
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 \

2
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

2
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; \

2
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:

2
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:

Loading…
Cancel
Save