diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 73ed70b..1dcf99b 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -150,6 +150,12 @@ jobs: run: | docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Cache Vault install id: cache-vault uses: actions/cache@v4 diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index 117faf5..508ad9e 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -40,13 +40,13 @@ jobs: id: services run: | # Ensure we have main branch available - git fetch origin main --depth=1 + git fetch origin main - # Find the common ancestor (merge-base) between PR branch and main - base=$(git merge-base origin/main ${{ github.sha }}) + # Find the common ancestor (merge-base) between PR HEAD and main + base=$(git merge-base HEAD origin/main) # Get all image names added/changed in docker-compose.yml since base - images=$(git diff $base ${{ github.sha }} -- docker-compose.yml \ + images=$(git diff $base HEAD -- docker-compose.yml \ | grep -E '^\+.*image:' \ | sed -E 's/.*image:[[:space:]]*//g' \ | awk -F: '{print $1}' \