Merge pull request '[HA] Automated PR for renovate/docker-compose-ollama-ollama - #32' (#32) from renovate/docker-compose-ollama-ollama into main

Reviewed-on: #32
This commit was merged in pull request #32.
This commit is contained in:
2025-09-19 10:08:33 -04:00
2 changed files with 10 additions and 4 deletions
+6
View File
@@ -150,6 +150,12 @@ jobs:
run: | run: |
docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf 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 - name: Cache Vault install
id: cache-vault id: cache-vault
uses: actions/cache@v4 uses: actions/cache@v4
+4 -4
View File
@@ -40,13 +40,13 @@ jobs:
id: services id: services
run: | run: |
# Ensure we have main branch available # 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 # Find the common ancestor (merge-base) between PR HEAD and main
base=$(git merge-base origin/main ${{ github.sha }}) base=$(git merge-base HEAD origin/main)
# Get all image names added/changed in docker-compose.yml since base # 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:' \ | grep -E '^\+.*image:' \
| sed -E 's/.*image:[[:space:]]*//g' \ | sed -E 's/.*image:[[:space:]]*//g' \
| awk -F: '{print $1}' \ | awk -F: '{print $1}' \