From 3f5b02ac6f13a94b0d6f7d0b04858cb9c7752673 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Jul 2024 16:01:00 +0000 Subject: [PATCH 1/9] :arrow_up: Update ghcr.io/linuxserver/radarr Docker digest to 2a02b31 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 20d278c..68538ba 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -43,7 +43,7 @@ services: - PGID=1000 radarr: - image: ghcr.io/linuxserver/radarr@sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73 + image: ghcr.io/linuxserver/radarr@sha256:2a02b311cefb344cd0caf74a443b9d6318daf15bda5280a3bc732381db983dc3 container_name: radarr ports: - "7878:7878" From 1e3a2db19c5ad5a5e821293bb98e883cec622644 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 23 Jul 2024 22:01:05 +0000 Subject: [PATCH 2/9] :arrow_up: Update ghcr.io/linuxserver/bazarr Docker digest to 25f0d19 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 20d278c..c8934c1 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -1,7 +1,7 @@ --- services: bazarr: - image: ghcr.io/linuxserver/bazarr@sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd + image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e container_name: bazarr ports: - "6767:6767" From e19c132f30a4d5fe30d253a87e07c579accc9e9c Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:19:23 -0400 Subject: [PATCH 3/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 8bb3a22..e3d5d12 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,7 +20,7 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | cut -d/ -f1 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^iac/docker/' | cut -d/ -f3 | sort | uniq) echo "Modified folders: $folders" echo "::set-output name=folders::$folders" @@ -83,8 +83,8 @@ jobs: -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \ "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/" - sleep 45 # Delay for 45 seconds before fetching logs - + sleep 45 + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) echo "AWX Job Logs for folder: $folder" From 0d60994a5b8b451159df1e55ad45d108c2ad8fab Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:26:33 -0400 Subject: [PATCH 4/9] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index ce53c2d..10c770e 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -17,14 +17,10 @@ jobs: with: node-version: 14 - - name: Install yamllint - run: | - npm install -g yaml-lint - - name: Show yamllint version run: | yamllint --version - name: Lint .yml files run: | - yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" ./**/*.yml \ No newline at end of file + yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" docker/**/*.yml \ No newline at end of file From c3148d66041609397e74e0aa0ab0e83f997b7ee5 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:38:46 -0400 Subject: [PATCH 5/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index e3d5d12..c0664dc 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,7 +20,7 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | grep '^iac/docker/' | cut -d/ -f3 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f3 | sort | uniq) echo "Modified folders: $folders" echo "::set-output name=folders::$folders" From 31ae8971bfee4818e5383b861000c1fcef11f0fd Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:47:12 -0400 Subject: [PATCH 6/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index c0664dc..d442914 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,9 +20,25 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f3 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq) echo "Modified folders: $folders" - echo "::set-output name=folders::$folders" + echo "::set-output name=folders::$folders" + + - name: Set condition for deployment + id: set-condition + run: | + if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then + echo "No relevant changes detected." + echo "::set-output name=continue::false" + else + echo "Relevant changes detected." + echo "::set-output name=continue::true" + fi + + if: steps.set-condition.outputs.continue == 'true' + steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Deploy to hosts run: | @@ -94,4 +110,4 @@ jobs: echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" echo "$(echo "$logs" | jq -r '.content')" - done + done From 11c2c2c82de8fb4ecbca7b8e87debbb03d4f5432 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:48:22 -0400 Subject: [PATCH 7/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index d442914..f6640fc 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -22,7 +22,7 @@ jobs: fi folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq) echo "Modified folders: $folders" - echo "::set-output name=folders::$folders" + echo "::set-output name=folders::$folders" - name: Set condition for deployment id: set-condition @@ -35,14 +35,17 @@ jobs: echo "::set-output name=continue::true" fi - if: steps.set-condition.outputs.continue == 'true' + conditional-deploy: + if: needs.deploy.outputs.continue == 'true' + runs-on: ubuntu-22.04 + needs: deploy steps: - name: Checkout repository uses: actions/checkout@v4 - name: Deploy to hosts run: | - IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}" + IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}" for folder in "${folder_array[@]}"; do case $folder in arrs) @@ -110,4 +113,4 @@ jobs: echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" echo "$(echo "$logs" | jq -r '.content')" - done + done From 9b9cdcdeb05c214a30c9eb63e52822062d223ff8 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:56:17 -0400 Subject: [PATCH 8/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index f6640fc..44d4602 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: ubuntu-22.04 + runs-on: docker steps: - name: Checkout repository uses: actions/checkout@v4 From 8d6fdbcc00138459f98be2626c12e0da627e1b90 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:58:14 -0400 Subject: [PATCH 9/9] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 44d4602..0148346 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -37,7 +37,7 @@ jobs: conditional-deploy: if: needs.deploy.outputs.continue == 'true' - runs-on: ubuntu-22.04 + runs-on: docker needs: deploy steps: - name: Checkout repository