fix(docker): couldn't access coinswap-builder

Author: hulxv

docker-setup.sh

@@ -485,22 +485,14 @@ build_image() {
         esac
     fi
 
-    # Set build flags based on single vs multi-platform
-    local BUILD_FLAGS="--platform $PLATFORM --progress=plain"
-    if [[ "$IS_MULTI_PLATFORM" == "false" ]]; then
-        BUILD_FLAGS="$BUILD_FLAGS --load"
-        print_info "Building single platform - will load into Docker"
-    else
-        print_warning "Multi-platform build - images won't be loaded into Docker"
-        print_info "Use 'docker buildx build --platform <platform> --load' to load a specific platform"
-    fi
-    
     # Build the shared builder image first
     print_info "Building builder image..."
+    
     if docker buildx build \
-        $BUILD_FLAGS \
+        --platform "$PLATFORM" \
+        $([ "$IS_MULTI_PLATFORM" = "false" ] && echo "--load") \
         -f docker/Dockerfile.builder \
-        -t coinswap-builder \
+        -t coinswap-builder:latest \
         .; then
         print_success "Builder image built successfully"
     else
@@ -509,34 +501,54 @@ build_image() {
         exit 1
     fi
 
+    # For multi-platform builds, we need to use the buildx cache
+    # For single-platform builds, the image is already loaded
+    
     # Build individual service images
     local services=("maker" "taker" "tracker" "test")
 
     for service in "${services[@]}"; do
         print_info "Building $service image..."
-        if docker buildx build \
-            $BUILD_FLAGS \
-            -f "docker/Dockerfile.$service" \
-            --build-arg BUILDER_IMAGE=coinswap-builder \
-            -t "coinswap-$service" \
-            .; then
-            print_success "$service image built successfully"
+        
+        if [ "$IS_MULTI_PLATFORM" = "false" ]; then
+            # Single platform: image is in local Docker, can build normally
+            if docker buildx build \
+                --platform "$PLATFORM" \
+                --load \
+                -f "docker/Dockerfile.$service" \
+                -t "coinswap-$service" \
+                .; then
+                print_success "$service image built successfully"
+            else
+                print_error "Failed to build $service image"
+                exit 1
+            fi
         else
-            print_error "Failed to build $service image"
-            exit 1
+            # Multi-platform: need to reference builder from buildx cache
+            if docker buildx build \
+                --platform "$PLATFORM" \
+                --build-context coinswap-builder=docker-image://coinswap-builder:latest \
+                -f "docker/Dockerfile.$service" \
+                -t "coinswap-$service" \
+                .; then
+                print_success "$service image built successfully"
+            else
+                print_error "Failed to build $service image"
+                exit 1
+            fi
         fi
     done
 
     echo ""
-    print_success "All Docker images built successfully for $PLATFORM"
+    print_success "✓ All Docker images built successfully for $PLATFORM"
     echo ""
 
     if [[ "$IS_MULTI_PLATFORM" == "false" ]]; then
         print_info "Built images:"
         docker images | grep -E "coinswap-(builder|maker|taker|tracker|test)" | head -5
     else
-        print_info "Multi-platform images built but not loaded into local Docker"
-        print_info "To load a specific platform, run:"
+        print_info "Multi-platform images built in buildx cache"
+        print_info "To load a specific platform into Docker, run:"
         echo "  docker buildx build --platform linux/amd64 --load -f docker/Dockerfile.builder -t coinswap-builder ."
     fi
 }

docker/Dockerfile.maker

@@ -1,6 +1,5 @@
 # Maker daemon Dockerfile
-ARG BUILDER_IMAGE=coinswap-builder
-FROM ${BUILDER_IMAGE} AS builder
+FROM coinswap-builder:latest AS builder
 
 FROM alpine:3.20
 

docker/Dockerfile.taker

@@ -1,6 +1,5 @@
 # Taker Dockerfile
-ARG BUILDER_IMAGE=coinswap-builder
-FROM ${BUILDER_IMAGE} AS builder
+FROM coinswap-builder:latest AS builder
 
 FROM alpine:3.20
 

docker/Dockerfile.test

@@ -1,6 +1,5 @@
 # Test environment Dockerfile
-ARG BUILDER_IMAGE=coinswap-builder
-FROM ${BUILDER_IMAGE} AS builder
+FROM coinswap-builder:latest AS builder
 
 FROM rust:1.90-alpine3.20
 

docker/Dockerfile.tracker

@@ -1,6 +1,5 @@
 # Tracker Dockerfile
-ARG BUILDER_IMAGE=coinswap-builder
-FROM ${BUILDER_IMAGE} AS builder
+FROM coinswap-builder:latest AS builder
 
 FROM alpine:3.20