From d85906d6531d4cc85e364dd77b178966a708b95a Mon Sep 17 00:00:00 2001
From: aceberg <1502200+aceberg@users.noreply.github.com>
Date: Tue, 30 Aug 2022 14:15:04 +0700
Subject: [PATCH] Action for ARM - 7

---
 .github/workflows/arm-docker-publish.yml | 68 ++++++++++++++++++++++++
 .github/workflows/docker-publish.yml     | 50 -----------------
 2 files changed, 68 insertions(+), 50 deletions(-)
 create mode 100644 .github/workflows/arm-docker-publish.yml
 delete mode 100644 .github/workflows/docker-publish.yml

diff --git a/.github/workflows/arm-docker-publish.yml b/.github/workflows/arm-docker-publish.yml
new file mode 100644
index 0000000..5eb3b93
--- /dev/null
+++ b/.github/workflows/arm-docker-publish.yml
@@ -0,0 +1,68 @@
+name: Build ARM image
+
+on:
+  push:
+    branches: [ "main" ]
+    # paths:
+    # - 'Dockerfile'
+    # - 'src/**'
+  pull_request:
+    branches: [ "main" ]
+    # paths:
+    # - 'Dockerfile'
+    # - 'src/**'
+
+env:
+  IMAGE_NAME: watchyourlan
+  TAGS: v0.7.3
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GHCR
+        # if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub
+        # if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Docker meta
+        id: meta1 # you'll use this in the next step
+        uses: docker/metadata-action@v4
+        with:
+          # list of Docker images to use as base name for tags
+          images: ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
+          # Docker tags based on the following events/attributes
+          tags: |
+            latest
+            ${{ env.TAGS }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          # platforms: linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: ${{ steps.meta1.outputs.tags }}
\ No newline at end of file
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
deleted file mode 100644
index 2844a7e..0000000
--- a/.github/workflows/docker-publish.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches: [ "main" ]
-    # paths:
-    # - 'Dockerfile'
-    # - 'src/**'
-  pull_request:
-    branches: [ "main" ]
-    # paths:
-    # - 'Dockerfile'
-    # - 'src/**'
-
-env:
-  IMAGE_NAME: watchyourlan
-  TAGS: latest, v0.7.3
-
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build and Push Docker Image to ghcr.io
-        uses: mr-smithers-excellent/docker-build-push@v5
-        with:
-          platform: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
-          image: ${{ env.IMAGE_NAME }}
-          tags: ${{ env.TAGS }}
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and Push Docker Image to docker.io
-        uses: mr-smithers-excellent/docker-build-push@v5
-        with:
-          platform: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
-          image: ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
-          tags: ${{ env.TAGS }}
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
\ No newline at end of file