更新脚本

Author: 239573049

.github/workflows/docker-image.yml

@@ -14,9 +14,4 @@ jobs:
         run: docker login -u "${{ secrets.DOCKER_USERNAME }}" crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com --password="${{ secrets.DOCKER_PASSWORD }}"
       - name: Build Backend Image
         run: ./build-image.sh
-      - name: Push Images
-        run: |
-          docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki
-          docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web
-          docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki:arm64
-          docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web:arm64
+

build-image.sh

@@ -13,53 +13,84 @@ docker buildx build \
     --platform linux/amd64 \
     -t crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki \
     -f src/KoalaWiki/Dockerfile \
-    --push .
+    --load .
 if [ $? -ne 0 ]; then
     echo "Error building backend amd64 image!"
     exit 1
 fi
 
+# Push backend amd64 image
+echo "Pushing backend amd64 image..."
+docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki
+if [ $? -ne 0 ]; then
+    echo "Error pushing backend amd64 image!"
+    exit 1
+fi
+
 # Build backend image specifically for arm64 platform using Dockerfile.arm
 echo "Building backend image for arm64 platform using Dockerfile.arm..."
 docker buildx build \
     --platform linux/arm64 \
     -t crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki:arm64 \
     -f src/KoalaWiki/Dockerfile.arm \
-    --push .
+    --load .
 if [ $? -ne 0 ]; then
     echo "Error building backend arm64 image!"
     exit 1
 fi
 
+# Push backend arm64 image
+echo "Pushing backend arm64 image..."
+docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki:arm64
+if [ $? -ne 0 ]; then
+    echo "Error pushing backend arm64 image!"
+    exit 1
+fi
+
 # Build frontend image for amd64 platform
 echo "Building frontend image for amd64 platform..."
 pushd web > /dev/null
 docker buildx build \
     --platform linux/amd64 \
     -t crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web \
     -f Dockerfile \
-    --push .
+    --load .
 if [ $? -ne 0 ]; then
     echo "Error building frontend amd64 image!"
     exit 1
 fi
+
+# Push frontend amd64 image
+echo "Pushing frontend amd64 image..."
+docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web
+if [ $? -ne 0 ]; then
+    echo "Error pushing frontend amd64 image!"
+    exit 1
+fi
 popd > /dev/null
 
 # Build frontend image for arm64 platform 
-# Note: This assumes frontend might also need special handling for arm64
 echo "Building frontend image for arm64 platform..."
 pushd web > /dev/null
 docker buildx build \
     --platform linux/arm64 \
     -t crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web:arm64 \
     -f Dockerfile.arm \
-    --push .
+    --load .
 if [ $? -ne 0 ]; then
     echo "Error building frontend arm64 image!"
     exit 1
 fi
+
+# Push frontend arm64 image
+echo "Pushing frontend arm64 image..."
+docker push crpi-j9ha7sxwhatgtvj4.cn-shenzhen.personal.cr.aliyuncs.com/koala-ai/koala-wiki-web:arm64
+if [ $? -ne 0 ]; then
+    echo "Error pushing frontend arm64 image!"
+    exit 1
+fi
 popd > /dev/null
 
 echo "==========================================="
 echo "Images built and pushed successfully!"
-echo "==========================================="
+echo "==========================================="