From b488c62c99341a5634b43b70590beabdf03e32b7 Mon Sep 17 00:00:00 2001
From: Naramsim <igougi.ui@gmail.com>
Date: Tue, 7 Jan 2025 14:19:58 +0100
Subject: [PATCH] feat: remove support for arm67/better names/update gh actions

---
 .github/workflows/docker-build-and-push.yml | 10 ++++------
 .github/workflows/docker-k8s.yml            |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index e2dd569c7..97a7f449c 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -1,4 +1,4 @@
-name: Build and Push Docker image
+name: Push Docker image
 
 on:
   push:
@@ -20,9 +20,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          # list of Docker images to use as base name for tags
-          images: |
-            pokeapi/pokeapi
+          images: pokeapi/pokeapi
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -30,7 +28,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_NARAMSIM }}
           password: ${{ secrets.DOCKERHUB_TOKEN_NARAMSIM }}
@@ -43,7 +41,7 @@ jobs:
           echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Resources/docker/app/Dockerfile
diff --git a/.github/workflows/docker-k8s.yml b/.github/workflows/docker-k8s.yml
index b90c1210d..a03e3a9d8 100644
--- a/.github/workflows/docker-k8s.yml
+++ b/.github/workflows/docker-k8s.yml
@@ -1,4 +1,4 @@
-name: Build Docker image and create k8s with it
+name: Test Docker and k8s
 
 on:
   pull_request:
@@ -23,12 +23,12 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Build
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Resources/docker/app/Dockerfile
           push: false
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64,linux/arm64 #,linux/arm/v7,linux/arm/v6
           tags: pokeapi/pokeapi:local
           labels: ${{ steps.meta.outputs.labels }}
       - name: Image digest