diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml index 60b4b2e..74e9355 100644 --- a/.gitea/workflows/build_push_internal_docker.yml +++ b/.gitea/workflows/build_push_internal_docker.yml @@ -27,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 }} @@ -43,13 +43,13 @@ 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.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION - docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.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 }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" + echo "${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" sleep 300 - docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION - docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest + 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 @@ -66,7 +66,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 }}