From e15e2e23c438775c036aa1d4baedde0784970aea Mon Sep 17 00:00:00 2001
From: chrislu <chris.lu@gmail.com>
Date: Sat, 22 Nov 2025 12:56:43 -0800
Subject: [PATCH] fix building

---
 .github/workflows/spark-integration-tests.yml | 46 +++++++++++++++++++
 test/java/spark/docker-compose.yml            | 21 +++++----
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/spark-integration-tests.yml b/.github/workflows/spark-integration-tests.yml
index 5292e53a1..54bf8ebb4 100644
--- a/.github/workflows/spark-integration-tests.yml
+++ b/.github/workflows/spark-integration-tests.yml
@@ -36,6 +36,21 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.24'
+
+    - name: Build SeaweedFS binary
+      run: |
+        echo "Building SeaweedFS binary..."
+        cd weed
+        go build -o ../docker/weed
+        cd ../docker
+        # Dockerfile.local expects these files in the build context
+        ls -la weed filer.toml entrypoint.sh
+        echo "✓ SeaweedFS binary built and ready for Docker build"
+
     - name: Build SeaweedFS Java dependencies
       run: |
         echo "Building Java client (required by HDFS clients)..."
@@ -157,6 +172,37 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.24'
+
+    - name: Build SeaweedFS binary
+      run: |
+        echo "Building SeaweedFS binary..."
+        cd weed
+        go build -o ../docker/weed
+        cd ../docker
+        ls -la weed filer.toml entrypoint.sh
+        echo "✓ SeaweedFS binary built and ready for Docker build"
+
+    - name: Build SeaweedFS Java dependencies
+      run: |
+        echo "Building Java client..."
+        cd other/java/client
+        mvn clean install -DskipTests -Dgpg.skip=true
+        cd ../../..
+        
+        echo "Building HDFS2 client..."
+        cd other/java/hdfs2
+        mvn clean install -DskipTests -Dgpg.skip=true
+        cd ../../..
+        
+        echo "Building HDFS3 client..."
+        cd other/java/hdfs3
+        mvn clean install -DskipTests -Dgpg.skip=true
+        echo "✓ All Java dependencies built"
+
     - name: Cache Apache Spark
       id: cache-spark
       uses: actions/cache@v3
diff --git a/test/java/spark/docker-compose.yml b/test/java/spark/docker-compose.yml
index a8b006765..9a0837fc1 100644
--- a/test/java/spark/docker-compose.yml
+++ b/test/java/spark/docker-compose.yml
@@ -2,7 +2,10 @@ version: '3.8'
 
 services:
   seaweedfs-master:
-    image: seaweedfs:test-grpc-v1.77.0
+    build:
+      context: ../../../docker
+      dockerfile: Dockerfile.local
+    image: seaweedfs:local
     container_name: seaweedfs-spark-master
     ports:
       - "9333:9333"
@@ -12,7 +15,10 @@ services:
       - seaweedfs-spark
 
   seaweedfs-volume:
-    image: seaweedfs:test-grpc-v1.77.0
+    build:
+      context: ../../../docker
+      dockerfile: Dockerfile.local
+    image: seaweedfs:local
     container_name: seaweedfs-spark-volume
     ports:
       - "8080:8080"
@@ -24,7 +30,10 @@ services:
       - seaweedfs-spark
 
   seaweedfs-filer:
-    image: seaweedfs:test-grpc-v1.77.0
+    build:
+      context: ../../../docker
+      dockerfile: Dockerfile.local
+    image: seaweedfs:local
     container_name: seaweedfs-spark-filer
     ports:
       - "8888:8888"
@@ -35,12 +44,6 @@ services:
       - seaweedfs-volume
     networks:
       - seaweedfs-spark
-    environment:
-      - GRPC_GO_LOG_VERBOSITY_LEVEL=99
-      - GRPC_GO_LOG_SEVERITY_LEVEL=info
-      - GLOG_v=4
-      - GLOG_logtostderr=true
-      - GODEBUG=http2debug=2
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "http://localhost:8888/"]
       interval: 5s