feat: add Apple Silicon (arm64) support for Docker image. #57

.github/workflows/ci.yml

@@ -78,44 +78,52 @@ jobs:
       - run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}"
       - run: echo "outputs.tag - ${{ needs.build.outputs.tag }}"
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+          
       # Create Docker Image
       - name: Docker login
         run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build wxmp image
+      # - name: Build wxmp image
+      #   working-directory: website
+      #   run: docker image build -t wxmp .
+
+      - name: Build and push multi-platform image
         working-directory: website
-        run: docker image build -t wxmp .
-
-      - name: Tags & Push image (latest)
         run: |
-          echo "outputs.tag - ${{ needs.build.outputs.version }}"
-          docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:latest
-          docker push ${{ secrets.DOCKER_USER }}/wxmp:latest
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t ${{ secrets.DOCKER_USER }}/wxmp:latest \
+            --push .
         
-      - name: Tags & Push image
+
+      - name: Build and push multi-platform image (with tag)
         if: needs.build.outputs.successful
-        run: |
-          echo "outputs.tag - ${{ needs.build.outputs.version }}"
-          docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
-          docker push ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
-
-      # Create Docker Image in GitHub
-      - name: Login to GitHub registry
-        run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Build docker image
         working-directory: website
-        run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
-
-      - name: Publish to GitHub registry
-        run: docker push ghcr.io/jaywcjlove/wxmp:latest
-
-      - name: Tag docker image (beta) and publish to GitHub registry
-        if: needs.build.outputs.successful
         run: |
-            echo "version: v${{ needs.build.outputs.version }}"
-            docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
-            docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t ${{ secrets.DOCKER_USER }}/wxmp:${{ needs.build.outputs.version }} \
+            --push .
+
+      # # Create Docker Image in GitHub
+      # - name: Login to GitHub registry
+      #   run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      # - name: Build docker image
+      #   working-directory: website
+      #   run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
+
+      # - name: Publish to GitHub registry
+      #   run: docker push ghcr.io/jaywcjlove/wxmp:latest
+
+      # - name: Tag docker image (beta) and publish to GitHub registry
+      #   if: needs.build.outputs.successful
+      #   run: |
+      #       echo "version: v${{ needs.build.outputs.version }}"
+      #       docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
+      #       docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
 
   build_windows: 
     needs: [build]

electron/app/package.json

@@ -24,7 +24,7 @@
     "@wcj/wxmp-preload": "2.4.0",
     "cpy-cli": "^5.0.0",
     "electron": "20.1.3",
-    "electron-builder": "23.6.0",
+    "electron-builder": "23.3.3",
     "website": "2.4.0"
   }
 }