[test]

.gitea/workflows/build_push_internal_docker.yml

@@ -35,7 +35,8 @@ jobs:
           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.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
 

.gitea/workflows/build_push_public_docker.yml

@@ -6,19 +6,20 @@ on:
     # Be carefull, conflict with package-deb *.*.*, don't use more than on dot *.* (ex: 2.5-runner)
       - '*-waf'
 
+env:
+  GIT_REPO: wafw00f
+  GIT_SERVER: https://github.com/EnableSecurity
+
 jobs:
-  build-and-push-image:
+  build-and-push:
-    # see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
+    #! see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
     # runs-on: test
     # container: debian:bullseye
     # runs-on: ubuntu-latest
     # container: node:16-bullseye
-    runs-on: debian-runner
+    runs-on: ubuntu-runner
-    container:
+    container: 
-      image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest
+      image: docker
-      credentials:
-        username: ${{ secrets.REGISTRY_DOCKER_USER }}
-        password: ${{ secrets.REGISTRY_DOCKER_PASS }}
 
     steps:
       - name: Show Information
@@ -27,8 +28,8 @@ jobs:
       - 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
+          git clone https://${{ env.GIT_SERVER }}/${{ env.GIT_REPO }}
-          cd wafw00f
+          cd ${{ env.GIT_REPO }}
           docker buildx b . -t ${{ vars.DOCKER_IMAGE_WAFWOOF }}
           docker tag ${{ vars.DOCKER_IMAGE_WAFWOOF }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_WAFWOOF }}
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_WAFWOOF }}