diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml index bcf9af6..a91b439 100644 --- a/.gitea/workflows/build_push_internal_docker.yml +++ b/.gitea/workflows/build_push_internal_docker.yml @@ -36,7 +36,7 @@ jobs: docker buildx b . -t ${{ vars.DOCKER_IMAGE_NAME }} - name: login & push run: | - echo "${{ secrets.PACKAGE_PUSH_REPO }}" | docker login -u ${{ vars.REPO_GITEA_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ vars.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 diff --git a/.gitea/workflows/build_push_public_docker.yml b/.gitea/workflows/build_push_public_docker.yml index df59afb..12a2df7 100644 --- a/.gitea/workflows/build_push_public_docker.yml +++ b/.gitea/workflows/build_push_public_docker.yml @@ -32,7 +32,7 @@ jobs: docker buildx b . -t ${{ env.GIT_REPO }} - name: login & push run: | - echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_PUSH_REPO }}" | docker login -u ${{ secrets.REPO_GITEA_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