From 59f821bf0a2c06a9379478fb2ca6d5c12fa871e6 Mon Sep 17 00:00:00 2001
From: Junyan Qin <1010553892@qq.com>
Date: Wed, 21 Feb 2024 13:44:07 +0000
Subject: [PATCH] =?UTF-8?q?ci:=20=E6=9E=84=E5=BB=BAarm64=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-docker-image.yml | 19 +++++++------------
 Dockerfile                               |  6 ++++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index dce50cb7..cbf6fbe3 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -17,22 +17,17 @@ jobs:
         run: |
           if [ -z "$GITHUB_REF" ]; then
             export GITHUB_REF=${{ github.ref }}
+            echo $GITHUB_REF
           fi
       - name: Check GITHUB_REF env
         run: echo $GITHUB_REF
-      - name: Get version
+      - name: Get version  # 在 GitHub Actions 运行环境
         id: get_version
         if: (startsWith(env.GITHUB_REF, 'refs/tags/')||startsWith(github.ref, 'refs/tags/')) && startsWith(github.repository, 'RockChinQ/QChatGPT')
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Build  # image name: rockchin/qchatgpt:<VERSION>
-        run: docker build --network=host -t rockchin/qchatgpt:${{ steps.get_version.outputs.VERSION }} -t rockchin/qchatgpt:latest .
+        run: export GITHUB_REF=${GITHUB_REF/refs\/tags\//}
       - name: Login to Registry
         run: docker login --username=${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_PASSWORD }}
-      
-      - name: Push image
-        if: (startsWith(env.GITHUB_REF, 'refs/tags/')||startsWith(github.ref, 'refs/tags/')) && startsWith(github.repository, 'RockChinQ/QChatGPT')
-        run: docker push rockchin/qchatgpt:${{ steps.get_version.outputs.VERSION }}
-
-      - name: Push latest image
-        if: (startsWith(env.GITHUB_REF, 'refs/tags/')||startsWith(github.ref, 'refs/tags/')) && startsWith(github.repository, 'RockChinQ/QChatGPT')
-        run: docker push rockchin/qchatgpt:latest
+      - name: Create Buildx
+        run: docker buildx create --name mybuilder --use
+      - name: Build  # image name: rockchin/qchatgpt:<VERSION>
+        run: docker buildx build --platform linux/arm64,linux/amd64 -t rockchin/qchatgpt:${{ env.GITHUB_REF }} -t rockchin/qchatgpt:latest . --push
diff --git a/Dockerfile b/Dockerfile
index 1dfd0058..47e4c5c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ WORKDIR /app
 
 COPY . .
 
-RUN python -m pip install -r requirements.txt
-
+RUN apt update \
+    && apt install gcc -y \
+    && python -m pip install -r requirements.txt  
+                        
 CMD [ "python", "main.py" ]
\ No newline at end of file