Merge remote-tracking branch 'origin/dev' into dev

.github/workflows/dockerimage.yml

@@ -1,18 +1,36 @@
 name: Release Docker Image
+
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
+
 jobs:
   build:
+    name: build
     runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
         with:
-          #ref: '70e4c2c0cb2f1c2f3d1c76de99a3e7593e3d7cae'
-          submodules: true
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build the Docker image
         run: |
-          docker login --username=${{ secrets.DOCKER_HUB_USER }} --password=${{ secrets.DOCKER_HUB_PWD }}
-          docker build -t b3log/siyuan:latest -t b3log/siyuan:v2.0.20 .
-          docker push b3log/siyuan -a
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t ${{ secrets.DOCKERHUB_USERNAME }}/siyuan:latest -t ${{ secrets.DOCKERHUB_USERNAME }}/siyuan:v2.0.20 .