mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-11-08 07:04:45 +08:00
fix docker
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
# Debug version of SeaweedFS with role mapping fixes
|
# Debug version of SeaweedFS with role mapping fixes
|
||||||
FROM alpine:latest
|
FROM alpine:3.18
|
||||||
|
|
||||||
# Install required packages
|
# Install required packages
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ COPY . .
|
|||||||
RUN cd weed && go build -o /usr/local/bin/weed
|
RUN cd weed && go build -o /usr/local/bin/weed
|
||||||
|
|
||||||
# Final runtime image
|
# Final runtime image
|
||||||
FROM alpine:latest
|
FROM alpine:3.18
|
||||||
|
|
||||||
# Install runtime dependencies
|
# Install runtime dependencies
|
||||||
RUN apk add --no-cache ca-certificates wget curl
|
RUN apk add --no-cache ca-certificates wget curl
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ docker-wait-healthy: ## Wait for all services to be healthy
|
|||||||
while true; do \
|
while true; do \
|
||||||
all_healthy=true; \
|
all_healthy=true; \
|
||||||
for service in $$required_services; do \
|
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..."; \
|
echo "Waiting for $$service to be healthy..."; \
|
||||||
all_healthy=false; \
|
all_healthy=false; \
|
||||||
break; \
|
break; \
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ services:
|
|||||||
PHPLDAPADMIN_LDAP_HOSTS: "ldap-server"
|
PHPLDAPADMIN_LDAP_HOSTS: "ldap-server"
|
||||||
PHPLDAPADMIN_HTTPS: "false"
|
PHPLDAPADMIN_HTTPS: "false"
|
||||||
ports:
|
ports:
|
||||||
- "8080:80"
|
- "8081:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
- ldap-server
|
- ldap-server
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ services:
|
|||||||
container_name: weed-volume
|
container_name: weed-volume
|
||||||
hostname: weed-volume
|
hostname: weed-volume
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8081:8080"
|
||||||
- "18080:18080"
|
- "18080:18080"
|
||||||
command: "volume -ip=weed-volume -port=8080 -dir=/data -mserver=weed-master:9333 -dataCenter=dc1 -rack=rack1"
|
command: "volume -ip=weed-volume -port=8080 -dir=/data -mserver=weed-master:9333 -dataCenter=dc1 -rack=rack1"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
Reference in New Issue
Block a user