From 22b40449866559cb6046d167a5629eaff094a5da Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Tue, 2 May 2023 12:24:38 +0200
Subject: [PATCH] tools/github actions: revert temporary changes used for trivy
 tests on fork/branch

---
 .github/workflows/docker-latest.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
index 52d86ff0..2ce685e8 100644
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@@ -1,7 +1,7 @@
 name: Build/push Docker image (master/latest)
 on:
   push:
-    branches: [ master, trivy ]
+    branches: [ master ]
 jobs:
   docker-build:
     runs-on: ubuntu-latest
@@ -11,11 +11,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # - name: Login to DockerHub
-      #   uses: docker/login-action@v2
-      #   with:
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -35,10 +35,10 @@ jobs:
         with:
           context: .
           push: true
-          # tags: |
-          #   ${{ secrets.DOCKER_IMAGE }}:trivy
-          #   ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy
-          tags: ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: |
+            ${{ secrets.DOCKER_IMAGE }}:latest
+            ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
       - name: Run trivy image scanner