From 0b9a2087ec05162da38ded90613c4b1fbd2044df Mon Sep 17 00:00:00 2001
From: EdyTheCow <git@edy.io>
Date: Fri, 19 Apr 2024 15:51:04 +0200
Subject: [PATCH] simplify workflow

---
 .../ente-server-tools-docker-image.yml        | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ente-server-tools-docker-image.yml b/.github/workflows/ente-server-tools-docker-image.yml
index 7bb87ae..316b2c2 100644
--- a/.github/workflows/ente-server-tools-docker-image.yml
+++ b/.github/workflows/ente-server-tools-docker-image.yml
@@ -3,28 +3,19 @@ name: Build and publish Ente server tools
 on: [push]
 
 jobs:
-  build-and-push-docker-image:
-    name: Build Docker image and push
-    runs-on: ubuntu-latest
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Github Packages
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      
-      - name: Build image and push to GitHub Container Registry
-        uses: docker/build-push-action@v5
-        with:
-          context: ente-server-tools/.
-          tags: ghcr.io/edythecow/ente-server-tools:latest
-          push: true
+            - name: Build and push
+              uses: mr-smithers-excellent/docker-build-push@v6
+              with:
+                  dockerfile: ente-server-tools/Dockerfile
+                  image: ente-server-tools
+                  registry: ghcr.io
+                  enableBuildKit: true
+                  tags: latest
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}