[tryhard]

.gitea/workflows/build_push_internal_docker.yml

@@ -7,7 +7,7 @@ on:
   push:
     tags:
     # Be carefull, conflict with package-deb *.*.*, don't use more than on dot *.* (ex: 2.5-runner)
-      - '*-runner'
+      - '*-internal'
 
 jobs:
   build-and-push-internal:
@@ -37,16 +37,17 @@ jobs:
       - name: login & push
         run: |
           echo "${{ secrets.PACKAGE_PUSH_REPO }}" | docker login -u ${{ vars.REPO_GITEA_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
-          docker images
-          docker pull gitea.jingoh.fr/staffadmin/test:0.0.1
-          docker tag gitea.jingoh.fr/staffadmin/test gitea.jingoh.fr/staffadmin/toto:latest
-          docker push gitea.jingoh.fr/staffadmin/toto:latest
           export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
+          docker images
+          echo "${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION"
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
 
+    # docker pull gitea.jingoh.fr/staffadmin/test:0.0.1
+    # docker tag gitea.jingoh.fr/staffadmin/test:0.0.1 gitea.jingoh.fr/staffadmin/toto:latest
+    # docker push gitea.jingoh.fr/staffadmin/toto:latest
 
 
       # - name: Git clone private repository

.gitea/workflows/build_push_package_deb.yml

@@ -10,7 +10,7 @@ env:
 on:
   push:
     tags:
-      - '*-samplescript'
+      - '*-package'
 
 jobs:
   build-package-push-repo:

.gitea/workflows/build_push_public_docker.yml

@@ -4,7 +4,7 @@ on:
   push:
     tags:
     # Be carefull, conflict with package-deb *.*.*, don't use more than on dot *.* (ex: 2.5-runner)
-      - '*-waf'
+      - '*-public'
 
 env:
   GIT_REPO: wafw00f
@@ -34,10 +34,10 @@ jobs:
         run: |
           echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
           export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
-          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:$VERSION
-          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:latest
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:$VERSION
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:latest
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.GIT_REPO }}:latest
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.GIT_REPO }}:latest
 
       - name: Output
         run: echo "Runner push on ${{ vars.REGISTRY_DOCKER }} image ${{ env.GIT_REPO }} tag ${{ gitea.ref_name }}"