From 61976fa2af7e7cd37af330be13d46673dacae956 Mon Sep 17 00:00:00 2001
From: staffadmin <stephane.gratiasquiquandon@gmail.com>
Date: Sat, 23 Nov 2024 18:01:08 +0100
Subject: [PATCH] [test build push docker image]

---
 .gitea/workflows/build_image_wafwoof.yml | 10 ++--------
 .gitea/workflows/build_push_docker.yml   |  4 ++--
 .gitea/workflows/demo.yaml               |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/build_image_wafwoof.yml b/.gitea/workflows/build_image_wafwoof.yml
index 010dde8..7086b12 100644
--- a/.gitea/workflows/build_image_wafwoof.yml
+++ b/.gitea/workflows/build_image_wafwoof.yml
@@ -13,7 +13,7 @@ jobs:
     # container: debian:bullseye
     # runs-on: ubuntu-latest
     # container: node:16-bullseye
-    runs-on: docker
+    runs-on: debian-runner
     container:
       image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest
       credentials:
@@ -24,15 +24,9 @@ jobs:
       - name: Show Information
         run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}"
 
-      - name: Login to docker private registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.REGISTRY_DOCKER }}
-          username: ${{ secrets.REGISTRY_DOCKER_USER }}
-          password: ${{ secrets.REGISTRY_DOCKER_PASS }}
-
       - name: clone & build & push
         run: |
+          echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
           git clone https://github.com/EnableSecurity/wafw00f
           cd wafw00f
           docker buildx b . -t ${{ vars.DOCKER_IMAGE_WAFWOOF }}
diff --git a/.gitea/workflows/build_push_docker.yml b/.gitea/workflows/build_push_docker.yml
index 4f634bd..300f1e2 100644
--- a/.gitea/workflows/build_push_docker.yml
+++ b/.gitea/workflows/build_push_docker.yml
@@ -10,7 +10,7 @@ on:
       - '*-runner'
 
 jobs:
-  build-and-push-debian-runner:
+  build-and-push:
     #! see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
     # runs-on: test
     # container: debian:bullseye
@@ -34,7 +34,7 @@ jobs:
           echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
           git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ vars.DOCKER_IMAGE_NAME }}
           cd ${{ vars.DOCKER_IMAGE_NAME }}
-          docker buildx b . -t ${{ vars.DOCKER_IMAGE_NAME }}
+          docker buildx b . -t ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}
           docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml
index 919f1f5..ee462df 100644
--- a/.gitea/workflows/demo.yaml
+++ b/.gitea/workflows/demo.yaml
@@ -4,7 +4,7 @@ run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
 on:
   push:
     tags:
-      - '*'
+      - '*-demo'
 ## Exemple https://github.com/actions/starter-workflows/blob/main/ci/docker-publish.yml
 
 jobs: