Multiarch for main Docker workflow (#506)

.github/workflows/docker-new.yml

@@ -1,70 +0,0 @@
-name: Publish Docker Image (new)
-on:
-  repository_dispatch:
-  workflow_dispatch:
-  workflow_run:
-    workflows: ["release"]
-    types:
-      - completed
-      - requested
-  push:
-    branches:
-      - "**"
-    tags:
-      - "v*.*.*"
-  pull_request:
-    branches:
-      - "main"
-
-env:
-  IMAGE_NAME: lycheeverse/lychee-dev
-  DOCKER_PLATFORMS: linux/amd64,linux/arm64/v8
-  DOCKERFILE: Dockerfile-CI.Dockerfile
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          # list of Docker images to use as base name for tags
-          images: |
-            ${{ env.IMAGE_NAME }}
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        if: ${{ github.repository_owner == 'lycheeverse' }}
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Push Image
-        if: ${{ github.repository_owner == 'lycheeverse' }}
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
-          platforms: ${{ env.DOCKER_PLATFORMS }}
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker.yml

@@ -1,24 +1,70 @@
+name: Docker
 on:
   repository_dispatch:
   workflow_dispatch:
+  workflow_run:
+    workflows: ["release"]
+    types:
+      - completed
+      - requested
   push:
     branches:
-      - master
+      - "**"
     tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - "main"
+
+env:
+  IMAGE_NAME: lycheeverse/lychee
+  DOCKER_PLATFORMS: linux/amd64,linux/arm64/v8
+  DOCKERFILE: Dockerfile-CI.Dockerfile
 
-name: Publish Docker Image
 jobs:
   build:
-    if: github.repository_owner == 'lycheeverse'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - name: Publish to Registry
-        uses: elgohr/Publish-Docker-Github-Action@3.01
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ${{ env.IMAGE_NAME }}
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        if: ${{ github.repository_owner == 'lycheeverse' }}
+        uses: docker/login-action@v1
         with:
-          name: lycheeverse/lychee
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          snapshot: true
-          tag_semver: true
+
+      - name: Push Image
+        if: ${{ github.repository_owner == 'lycheeverse' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ${{ env.DOCKERFILE }}
+          platforms: ${{ env.DOCKER_PLATFORMS }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}