From b7d5f4e37dedd69f15d785ae612b0f62de21f588 Mon Sep 17 00:00:00 2001
From: Henrik Tilly <list@tilly.nu>
Date: Fri, 6 Sep 2024 12:25:51 +0200
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 70 +++++-------------------------
 1 file changed, 11 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3e57450..dae9456 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,77 +3,29 @@ name: Build and Push Multi-Platform Docker Image
 on:
   push:
     branches:
-      - master
+      - master  # Trigger on pushes to the master branch
 
 jobs:
-  build-amd64:
+  build:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout the repository
       uses: actions/checkout@v4.1.7
-
-    - name: Docker Setup QEMU for amd64
-      uses: docker/setup-qemu-action@v3.2.0
       
-    - name: Set up Docker Buildx for amd64
-      uses: docker/setup-buildx-action@v3.6.1
-
-    - name: Log in to Docker Hub for amd64
-      run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-    - name: Build and push Docker image for amd64
-      run: |
-        docker buildx build --platform linux/amd64 --push \
-          -t ${{ secrets.DOCKERHUB_USERNAME }}/slackonos:amd64-latest .
-
-  build-arm64:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout the repository
-      uses: actions/checkout@v4.1.7
-
-    - name: Docker Setup QEMU for arm64
+    - name: Docker Setup QEMU
       uses: docker/setup-qemu-action@v3.2.0
-      
-    - name: Set up Docker Buildx for arm64
+            
+    - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3.6.1
 
-    - name: Log in to Docker Hub for arm64
+    - name: Log in to Docker Hub
       run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
-    - name: Build and push Docker image for arm64
+    - name: Build and push multi-platform Docker image
       run: |
-        docker buildx build --platform linux/arm64 --push \
-          -t ${{ secrets.DOCKERHUB_USERNAME }}/slackonos:arm64-latest .
-
-  build-armv7:
-    runs-on: ubuntu-latest
+        docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push \
+          -t ${{ secrets.DOCKERHUB_USERNAME }}/slackonos:latest .
 
-    steps:
-    - name: Checkout the repository
-      uses: actions/checkout@v4.1.7
-
-    - name: Docker Setup QEMU for armv7
-      uses: docker/setup-qemu-action@v3.2.0
-      
-    - name: Set up Docker Buildx for armv7
-      uses: docker/setup-buildx-action@v3.6.1
-
-    - name: Log in to Docker Hub for armv7
-      run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-    - name: Build and push Docker image for armv7
-      run: |
-        docker buildx build --platform linux/arm/v7 --push \
-          -t ${{ secrets.DOCKERHUB_USERNAME }}/slackonos:armv7-latest .
-
-  verify-manifest:
-    needs: [build-amd64, build-arm64, build-armv7]
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Verify the multi-platform image
-      run: |
-        docker buildx imagetools inspect ${{ secrets.DOCKERHUB_USERNAME }}/slackonos:latest
+    - name: Verify the platforms
+      run: docker buildx inspect --bootstrap