diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml index 4104535..7f397c3 100644 --- a/.gitea/workflows/build_push_internal_docker.yml +++ b/.gitea/workflows/build_push_internal_docker.yml @@ -40,10 +40,10 @@ jobs: docker images export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) sleep 300 - 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 }}/${{ GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION + docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + docker push ${{ vars.REGISTRY_DOCKER }}/${{ GIT_USER_REPO }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION + docker push ${{ vars.REGISTRY_DOCKER }}/${{ 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 diff --git a/.gitea/workflows/build_push_public_docker.yml b/.gitea/workflows/build_push_public_docker.yml index d574b78..4a20353 100644 --- a/.gitea/workflows/build_push_public_docker.yml +++ b/.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 }}/${{ 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 }}/${{ GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION + docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ GIT_USER_REPO }}/${{ env.GIT_REPO }}:latest + docker push ${{ vars.REGISTRY_DOCKER }}/${{ GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION + docker push ${{ vars.REGISTRY_DOCKER }}/${{ 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 }}" \ No newline at end of file