[tryhard]

.gitea/workflows/build_push_internal_docker.yml

@@ -10,7 +10,7 @@ on:
       - '*-runner'
 
 jobs:
-  build-and-push:
+  build-and-push-internal:
     #! see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
     # runs-on: test
     # container: debian:bullseye
@@ -29,15 +29,21 @@ jobs:
     steps:
       - name: Show Information
         run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}"
-      - name: login & clone & build & push
+      - name: clone & build
         run: |
-          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.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ gitea.ref_name }}
+          docker buildx b . -t ${{ vars.DOCKER_IMAGE_NAME }}
+          export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
+          echo $VERSION
+          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 }}:${{ gitea.ref_name }}
+      - name: login & push
+        run: |
+          echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
+          docker images
+          export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
 
 

.gitea/workflows/build_push_public_docker.yml

@@ -11,7 +11,7 @@ env:
   GIT_SERVER: https://github.com/EnableSecurity
 
 jobs:
-  build-and-push:
+  build-and-push-public:
     #! see on runner /data/.runner to add label (test => test:docker://debian:bullseye)
     # runs-on: test
     # container: debian:bullseye
@@ -32,7 +32,8 @@ jobs:
           cd ${{ env.GIT_REPO }}
           docker buildx b . -t ${{ env.GIT_REPO }}
           docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:${{ gitea.ref_name }}
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:latest
 
       - name: Output
         run: echo "Runner push on ${{ vars.REGISTRY_DOCKER }} image ${{ env.GIT_REPO }} tag ${{ gitea.ref_name }}"