From 2eb569cc593c1635805137e015c62b489b48bd5c Mon Sep 17 00:00:00 2001
From: GilbN <gilberg@gmail.com>
Date: Sat, 2 Apr 2022 20:29:25 +0200
Subject: [PATCH] take 3

---
 .github/workflows/docker-build.yml           | 20 ++++++++++----------
 Dockerfile.amd64 => linux-amd64.Dockerfile   |  2 +-
 Dockerfile.armhf => linux-arm-v7.Dockerfile  |  2 +-
 Dockerfile.aarch64 => linux-arm64.Dockerfile |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename Dockerfile.amd64 => linux-amd64.Dockerfile (84%)
 rename Dockerfile.armhf => linux-arm-v7.Dockerfile (84%)
 rename Dockerfile.aarch64 => linux-arm64.Dockerfile (84%)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7160ae1a..6a4d839a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [armhf, aarch64, amd64]
+        architecture: [linux-arm-v7,linux-arm64, linux-amd64]
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -37,7 +37,7 @@ jobs:
         run: |
           ARCHITECTURE=${{ matrix.architecture }}
           echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
-          echo ::set-output name=platform::${ARCHITECTURE}
+          echo ::set-output name=platform::${ARCHITECTURE//-/\/}
       - name: Set current date as env variable
         id: date_time
         run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
@@ -76,8 +76,8 @@ jobs:
         if: ${{ github.event.release.target_commitish == 'master' }}
         uses: docker/build-push-action@v2
         with:
-          file: ./Dockerfile.${{ matrix.architecture }}
-          platforms: ${{ matrix.architecture }}
+          file: ./${{ matrix.architecture }}.Dockerfile
+          platforms: ${{ steps.prep.outputs.platform }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: latest, ${{ steps.prep.outputs.VERSION }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -87,8 +87,8 @@ jobs:
         if: ${{ github.event.inputs.branch == 'master' }}
         uses: docker/build-push-action@v2
         with:
-          file: ./Dockerfile.${{ matrix.architecture }}
-          platforms: ${{ matrix.architecture }}
+          file: ./${{ matrix.architecture }}.Dockerfile
+          platforms: ${{ steps.prep.outputs.platform }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: latest, ${{ github.event.inputs.tag }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -98,8 +98,8 @@ jobs:
         if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
         uses: docker/build-push-action@v2
         with:
-          file: ./Dockerfile.${{ matrix.architecture }}
-          platforms: ${{ matrix.architecture }}
+          file: ./${{ matrix.architecture }}.Dockerfile
+          platforms: ${{ steps.prep.outputs.platform }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -109,8 +109,8 @@ jobs:
         if: ${{ github.ref == 'refs/heads/testing' || github.event.inputs.branch == 'testing' }}
         uses: docker/build-push-action@v2
         with:
-          file: ./Dockerfile.${{ matrix.architecture }}
-          platforms: ${{ matrix.architecture }}
+          file: ./${{ matrix.architecture }}.Dockerfile
+          platforms: ${{ steps.prep.outputs.platform }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
diff --git a/Dockerfile.amd64 b/linux-amd64.Dockerfile
similarity index 84%
rename from Dockerfile.amd64
rename to linux-amd64.Dockerfile
index d62c35f7..5d81cd76 100644
--- a/Dockerfile.amd64
+++ b/linux-amd64.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/linux-arm-v7.Dockerfile
similarity index 84%
rename from Dockerfile.armhf
rename to linux-arm-v7.Dockerfile
index 10574560..94b02f71 100644
--- a/Dockerfile.armhf
+++ b/linux-arm-v7.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/linux-arm64.Dockerfile
similarity index 84%
rename from Dockerfile.aarch64
rename to linux-arm64.Dockerfile
index d1dd2f0e..0cdaa82b 100644
--- a/Dockerfile.aarch64
+++ b/linux-arm64.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM}  ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE