From a98092aea6ebcc43630c55c8d59d58e540d3fb2f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Dec 2024 19:01:09 +0000 Subject: [PATCH 01/15] :arrow_up: Update codeberg.org/forgejo/forgejo Docker tag to v9.0.3 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 1661830..9b15d6b 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -1,7 +1,7 @@ --- services: server: - image: codeberg.org/forgejo/forgejo:9.0.2 + image: codeberg.org/forgejo/forgejo:9.0.3 container_name: forgejo environment: - USER_UID=1000 From 61f1a9eb4f2bed4d617721c75ac2f7ec4ec7ab83 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:38:09 -0500 Subject: [PATCH 02/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index e312d66..d1109dc 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -1,5 +1,3 @@ -name: Lint on PR - on: pull_request: types: [opened, synchronize, reopened] @@ -17,16 +15,16 @@ jobs: - name: Get modified YAML files id: get_changed_files run: | - CHANGED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -E '\.(yml)$' || true) - echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV + CHANGED_FILES=$(git diff --name-only HEAD^ HEAD | grep -E '\.(yml)$' || true) + echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV - name: Run yamllint on modified files if: env.CHANGED_FILES != '' run: | - yamllint $CHANGED_FILES + yamllint $CHANGED_FILES env: CHANGED_FILES: ${{ env.CHANGED_FILES }} - name: Skip linting if no YAML files are changed if: env.CHANGED_FILES == '' - run: echo "No YAML files changed in this PR. Skipping lint." \ No newline at end of file + run: echo "No YAML files changed in this PR. Skipping lint." From f518ae43d9c83694b33e670284385bdde1c910e2 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:39:16 -0500 Subject: [PATCH 03/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index d1109dc..c730b5c 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -15,7 +15,11 @@ jobs: - name: Get modified YAML files id: get_changed_files run: | - CHANGED_FILES=$(git diff --name-only HEAD^ HEAD | grep -E '\.(yml)$' || true) + if git rev-parse --verify HEAD^ >/dev/null 2>&1; then + CHANGED_FILES=$(git diff --name-only HEAD^ HEAD | grep -E '\.(yml)$' || true) + else + CHANGED_FILES=$(git diff --name-only $(git hash-object -t tree /dev/null) HEAD | grep -E '\.(yml)$' || true) + fi echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV - name: Run yamllint on modified files From 557c08998a7ca566fe7bd3979742518f4ee37aa6 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:44:09 -0500 Subject: [PATCH 04/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index c730b5c..7d418bf 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -12,20 +12,23 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Fetch all branches + run: git fetch --all + - name: Get modified YAML files id: get_changed_files run: | - if git rev-parse --verify HEAD^ >/dev/null 2>&1; then - CHANGED_FILES=$(git diff --name-only HEAD^ HEAD | grep -E '\.(yml)$' || true) - else - CHANGED_FILES=$(git diff --name-only $(git hash-object -t tree /dev/null) HEAD | grep -E '\.(yml)$' || true) - fi - echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV + BASE_BRANCH=$(git merge-base HEAD origin/${{ github.event.pull_request.base.ref }}) + CHANGED_FILES=$(git diff --name-only $BASE_BRANCH HEAD | grep -E '\.(yml)$' || true) + echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV + + - name: Debug changed files + run: echo "Changed files: ${{ env.CHANGED_FILES }}" - name: Run yamllint on modified files if: env.CHANGED_FILES != '' run: | - yamllint $CHANGED_FILES + yamllint $CHANGED_FILES env: CHANGED_FILES: ${{ env.CHANGED_FILES }} From e59688cfd423d02596b95508cb9a672d55352dbf Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:45:48 -0500 Subject: [PATCH 05/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 7d418bf..5fd7763 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -18,7 +18,7 @@ jobs: - name: Get modified YAML files id: get_changed_files run: | - BASE_BRANCH=$(git merge-base HEAD origin/${{ github.event.pull_request.base.ref }}) + BASE_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD) CHANGED_FILES=$(git diff --name-only $BASE_BRANCH HEAD | grep -E '\.(yml)$' || true) echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV From c59f0feb45f3573e4fbf3924c50362849591dab7 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:50:46 -0500 Subject: [PATCH 06/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 5fd7763..37935ad 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -1,3 +1,5 @@ +name: Lint on PR + on: pull_request: types: [opened, synchronize, reopened] @@ -12,26 +14,15 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Fetch all branches - run: git fetch --all - - - name: Get modified YAML files - id: get_changed_files + - name: Debug Repository Contents run: | - BASE_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD) - CHANGED_FILES=$(git diff --name-only $BASE_BRANCH HEAD | grep -E '\.(yml)$' || true) - echo "CHANGED_FILES=$CHANGED_FILES" >> $GITHUB_ENV + pwd + ls -R - - name: Debug changed files - run: echo "Changed files: ${{ env.CHANGED_FILES }}" + - name: Show yamllint version + run: | + yamllint --version - - name: Run yamllint on modified files - if: env.CHANGED_FILES != '' - run: | - yamllint $CHANGED_FILES - env: - CHANGED_FILES: ${{ env.CHANGED_FILES }} - - - name: Skip linting if no YAML files are changed - if: env.CHANGED_FILES == '' - run: echo "No YAML files changed in this PR. Skipping lint." + - name: Lint .yml files + run: | + yamllint -d docker/**/*.yml From b47a61f5902fda43fee159a116718341c1796f99 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:52:57 -0500 Subject: [PATCH 07/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 37935ad..49e5ca3 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -25,4 +25,4 @@ jobs: - name: Lint .yml files run: | - yamllint -d docker/**/*.yml + yamllint -v -d docker/**/*.yml From ff84b5abe02279479f03faed455da22e86f2057f Mon Sep 17 00:00:00 2001 From: mafyuh Date: Thu, 12 Dec 2024 23:54:09 -0500 Subject: [PATCH 08/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 49e5ca3..089f403 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -25,4 +25,4 @@ jobs: - name: Lint .yml files run: | - yamllint -v -d docker/**/*.yml + yamllint -v -d ./docker/**/*.yml From fb066bd620ed5eeaf1f915538a5c016bf257058a Mon Sep 17 00:00:00 2001 From: mafyuh Date: Fri, 13 Dec 2024 00:04:59 -0500 Subject: [PATCH 09/15] 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 089f403..2c7fe41 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -14,10 +14,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Debug Repository Contents - run: | - pwd - ls -R - name: Show yamllint version run: | @@ -25,4 +21,4 @@ jobs: - name: Lint .yml files run: | - yamllint -v -d ./docker/**/*.yml + find docker -name "*.yml" -exec yamllint {} \; From 10e64dad003821cd168565846afd04443bf278f6 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Fri, 13 Dec 2024 00:07:19 -0500 Subject: [PATCH 10/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 2c7fe41..1f5af25 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -21,4 +21,4 @@ jobs: - name: Lint .yml files run: | - find docker -name "*.yml" -exec yamllint {} \; + find docker -name "*.yml" -exec yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" {} \; From e9d358bc174cafc93461a2d32f65a020ae9fd4ec Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Fri, 13 Dec 2024 00:23:31 -0500 Subject: [PATCH 11/15] fix all but 1 yaml files for yamllint --- docker/AI/docker-compose.yml | 1 - docker/arm/docker-compose.yml | 4 ++-- docker/arrs/docker-compose.yml | 2 +- docker/authentik/docker-compose.yml | 18 +++++++++--------- docker/grafana/docker-compose.yml | 18 +++++++++--------- docker/jellyfin/docker-compose.yml | 9 +++++---- docker/npm/docker-compose.yml | 6 +++--- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index fdecece..f27e8be 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -103,4 +103,3 @@ volumes: ollama: external: true open-webui: - diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 9b15d6b..2dd978f 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -65,7 +65,7 @@ services: restart: unless-stopped networks: - gitea_main - + fail2ban: image: crazymax/fail2ban:1.1.0 container_name: fail2ban @@ -204,7 +204,7 @@ services: - 22000:22000/udp - 21027:21027/udp restart: unless-stopped - + wiki-db: image: postgres:15-alpine environment: diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 0d40d45..5b53f6f 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -228,4 +228,4 @@ volumes: driver_opts: type: nfs o: addr=nas.lan,vers=4,rw - device: ":/mnt/thePool/thePoolShare/Media" \ No newline at end of file + device: ":/mnt/thePool/thePoolShare/Media" diff --git a/docker/authentik/docker-compose.yml b/docker/authentik/docker-compose.yml index cb21097..0e5c389 100644 --- a/docker/authentik/docker-compose.yml +++ b/docker/authentik/docker-compose.yml @@ -78,16 +78,16 @@ services: depends_on: - postgresql - redis - + authentik_ldap: - image: ghcr.io/goauthentik/ldap:2024.10.5 - ports: - - 389:3389 - - 636:6636 - environment: - AUTHENTIK_HOST: ${AUTH_HOST} - AUTHENTIK_INSECURE: "true" - AUTHENTIK_TOKEN: ${AUTH_TOKEN} + image: ghcr.io/goauthentik/ldap:2024.10.5 + ports: + - 389:3389 + - 636:6636 + environment: + AUTHENTIK_HOST: ${AUTH_HOST} + AUTHENTIK_INSECURE: "true" + AUTHENTIK_TOKEN: ${AUTH_TOKEN} volumes: database: diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index d54dc2a..461e89c 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -32,7 +32,7 @@ services: - GF_AUTH_GENERIC_OAUTH_API_URL=$AUTHENTIK_URL/application/o/userinfo/ - GF_AUTH_SIGNOUT_REDIRECT_URL=$AUTHENTIK_URL/application/o/grafana/end-session/ - GF_AUTH_OAUTH_AUTO_LOGIN=false - - GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL + - GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL user: "1000" volumes: - /docker/appdata/grafana:/var/lib/grafana @@ -93,7 +93,7 @@ services: - /:/host:ro,rslave networks: - grafana - + cadvisor: image: gcr.io/cadvisor/cadvisor:v0.51.0 container_name: cadvisor @@ -116,7 +116,7 @@ services: command: ["sonarr"] environment: PORT: 9707 - URL: $SONARR_URL + URL: $SONARR_URL APIKEY: $SONARR_API ports: - "9707:9707" @@ -129,7 +129,7 @@ services: command: ["radarr"] environment: PORT: 9708 - URL: $RADARR_URL + URL: $RADARR_URL APIKEY: $RADARR_API ports: - "9708:9708" @@ -144,9 +144,9 @@ services: PORT: 9710 URL: $PROWLARR_URL APIKEY: $PROWLARR_API - PROWLARR__BACKFILL: true + PROWLARR__BACKFILL: true ports: - - "9710:9710" + - "9710:9710" restart: unless-stopped networks: - grafana @@ -156,10 +156,10 @@ services: command: ["sabnzbd"] environment: PORT: 9711 - URL: $SAB_URL + URL: $SAB_URL APIKEY: $SAB_API ports: - - "9711:9711" + - "9711:9711" restart: unless-stopped networks: - grafana @@ -215,4 +215,4 @@ networks: grafana: volumes: - prom_data: \ No newline at end of file + prom_data: diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index 10ece7c..79786e9 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -57,7 +57,7 @@ services: - 22000:22000/udp - 21027:21027/udp restart: unless-stopped - + jellystat-db: image: postgres:15.2 environment: @@ -65,7 +65,8 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: $POSTGRES_PASSWORD volumes: - - /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data + - /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data + jellystat: image: cyfershepard/jellystat:1.1.1 environment: @@ -75,7 +76,7 @@ services: POSTGRES_PORT: 5432 JWT_SECRET: $JWT_SECRET ports: - - "3000:3000" + - "3000:3000" volumes: - /docker/appdata/jellystat/backup-data:/app/backend/backup-data depends_on: @@ -88,4 +89,4 @@ volumes: driver_opts: type: nfs o: addr=nas.lan,vers=4,rw - device: ":/mnt/thePool/thePoolShare/Media" \ No newline at end of file + device: ":/mnt/thePool/thePoolShare/Media" diff --git a/docker/npm/docker-compose.yml b/docker/npm/docker-compose.yml index 9a6d681..1996fc4 100644 --- a/docker/npm/docker-compose.yml +++ b/docker/npm/docker-compose.yml @@ -11,7 +11,7 @@ services: - /docker/appdata/nginx/data:/data - /docker/appdata/nginx/letsencrypt:/etc/letsencrypt restart: unless-stopped - + fail2ban: image: crazymax/fail2ban:1.1.0 container_name: fail2ban_docker-pi @@ -35,7 +35,7 @@ services: - SSMTP_PASSWORD=$SSMTP_PASSWORD - SSMTP_TLS=YES restart: always - + cf-tunnel: restart: unless-stopped image: cloudflare/cloudflared@sha256:055932e8581b57a65f08f6232762d000a8ec6e0709fe783b47090490457f9091 @@ -52,4 +52,4 @@ services: - TWINGATE_LABEL_HOSTNAME=${HOSTNAME} - TWINGATE_LABEL_DEPLOYED_BY=docker sysctls: - - net.ipv4.ping_group_range=0 2147483647 \ No newline at end of file + - net.ipv4.ping_group_range=0 2147483647 From 2a8cf62e085f66cd1c6f37e900ec43ad86ecf861 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Fri, 13 Dec 2024 00:25:36 -0500 Subject: [PATCH 12/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 1f5af25..7df5a18 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -21,4 +21,4 @@ jobs: - name: Lint .yml files run: | - find docker -name "*.yml" -exec yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" {} \; + find docker -name "*.yml" -exec yamllint -c --strict -d "{extends: relaxed, rules: {line-length: {max: 120}}}" {} \; From abd09df51d6b54a182e086aa97b3d845f995554a Mon Sep 17 00:00:00 2001 From: mafyuh Date: Fri, 13 Dec 2024 00:26:47 -0500 Subject: [PATCH 13/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 7df5a18..e77782b 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -21,4 +21,4 @@ jobs: - name: Lint .yml files run: | - find docker -name "*.yml" -exec yamllint -c --strict -d "{extends: relaxed, rules: {line-length: {max: 120}}}" {} \; + find docker -name "*.yml" -exec yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" --no-warnings {} \; From 93c2e64d32e2fb72b6da7338445a2a317c4250f0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Dec 2024 15:01:10 +0000 Subject: [PATCH 14/15] :arrow_up: Update ghcr.io/n8n-io/n8n Docker tag to v1.72.1 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 2dd978f..e315819 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -133,7 +133,7 @@ services: networks: - gitea_main n8n: - image: ghcr.io/n8n-io/n8n:1.72.0 + image: ghcr.io/n8n-io/n8n:1.72.1 container_name: n8n ports: - 5678:5678 From fa6a6568e71015662f166996d2c4d02d71767660 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Fri, 13 Dec 2024 00:31:57 -0500 Subject: [PATCH 15/15] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index e77782b..1ff4731 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -21,4 +21,4 @@ jobs: - name: Lint .yml files run: | - find docker -name "*.yml" -exec yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" --no-warnings {} \; + find docker -name "*.yml" -exec yamllint -s -d "{extends: relaxed, rules: {line-length: {max: 120}}}" {} \;