[tryhard always and fore ever]

.gitea/workflows/build_push_internal_docker.yml

@@ -9,6 +9,11 @@ on:
     # Be carefull, conflict with package-deb *.*.*, don't use more than on dot *.* (ex: 2.5-runner)
       - '*-internal'
 
+
+env:
+  GIT_REPO: gitea-runner
+  DOCKER_IMAGE_NAME: tryhard
+
 jobs:
   build-and-push-internal:
     #! see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
@@ -22,7 +27,7 @@ jobs:
     # container:
     #   image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest
     #   credentials:
-    #     username: ${{ secrets.REGISTRY_DOCKER_USER }}
+    #     username: ${{ secrets.GIT_USER_REPO }}
     #     password: ${{ secrets.REGISTRY_DOCKER_PASS }}
 
 
@@ -31,19 +36,19 @@ jobs:
         run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}"
       - name: clone & build
         run: |
-          git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/gitea-runner
-          cd gitea-runner
-          docker buildx b . -t ${{ vars.DOCKER_IMAGE_NAME }}
+          git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.GIT_REPO }}
+          cd ${{ env.GIT_REPO }}
+          docker buildx b . -t ${{ env.DOCKER_IMAGE_NAME }}
       - name: login & push
         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 ${{ 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 tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION
+          docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.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
+          echo "${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION"
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.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
@@ -60,7 +65,7 @@ jobs:
       #   uses: docker/login-action@v3
       #   with:
       #     registry: ${{ vars.REGISTRY_DOCKER }}
-      #     username: ${{ secrets.REGISTRY_DOCKER_USER }}
+      #     username: ${{ secrets.GIT_USER_REPO }}
       #     password: ${{ secrets.REGISTRY_DOCKER_PASS }}
 
 
@@ -71,7 +76,7 @@ jobs:
       #   with:
       #     context: .
       #     push: true
-      #     tags: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest,${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
+      #     tags: ${{ vars.REGISTRY_DOCKER }}/${{ env.DOCKER_IMAGE_NAME }}:latest,${{ vars.REGISTRY_DOCKER }}/${{ env.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
 
       # - name: Output
-      #   run: echo "Runner push on ${{ vars.REGISTRY_DOCKER }} image ${{ vars.DOCKER_IMAGE_NAME }} tag ${{ gitea.ref_name }}"
+      #   run: echo "Runner push on ${{ vars.REGISTRY_DOCKER }} image ${{ env.DOCKER_IMAGE_NAME }} tag ${{ gitea.ref_name }}"

.gitea/workflows/build_push_package_deb.yml

@@ -47,9 +47,9 @@ jobs:
 
       - name: Push packages
         run: |
-          curl --user ${{ vars.REPO_GITEA_USER }}:${{ secrets.PACKAGE_PUSH_REPO }} \
+          curl --user ${{ secrets.REGISTRY_DOCKER_USER }}:${{ secrets.PACKAGE_PUSH_REPO }} \
               --upload-file ${{ env.PACKAGE_NAME }}_${{ gitea.ref_name }}_${{ env.ARCH }}.deb \
-              https://${{ env.GIT_REPO_URL }}/api/packages/${{ vars.REPO_GITEA_USER }}/debian/pool/${{ env.DEB_OS_TARGET }}/main/upload
+              https://${{ env.GIT_REPO_URL }}/api/packages/${{ secrets.REGISTRY_DOCKER_USER }}/debian/pool/${{ env.DEB_OS_TARGET }}/main/upload
 
       - name: Output
-        run: echo "Runner push on ${{ env.GIT_REPO_URL }} with user ${{ vars.REPO_GITEA_USER }} package ${{ env.PACKAGE_NAME }} os ${{ env.DEB_OS_TARGET }} tag ${{ gitea.ref_name }}"
+        run: echo "Runner push on ${{ env.GIT_REPO_URL }} with user ${{ secrets.REGISTRY_DOCKER_USER }} package ${{ env.PACKAGE_NAME }} os ${{ env.DEB_OS_TARGET }} tag ${{ gitea.ref_name }}"

.gitea/workflows/build_push_public_docker.yml

@@ -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 }}/${{ 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
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }}:latest
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.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 }}"