From 5c4df64a602e6310a2f617e953caee703fc3f489 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 20:05:07 -0400 Subject: [PATCH 1/9] Restoring Scraparr. --- docker-compose.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 674b4d4e..794d7ec3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5669,6 +5669,30 @@ services: - ${DOCKER_VOLUME_CONFIG}/sablier/state:/opt/sablier/state - ${DOCKER_VOLUME_CONFIG}/sablier/custom_themes:/opt/sablier/custom_themes - /var/run/docker.sock:/var/run/docker.sock + scraparr: + container_name: scraparr + depends_on: + - bazarr + - prowlarr + - radarr + - readarr + - sonarr + environment: + BAZARR_API_KEY: ${BAZARR_API_KEY} + BAZARR_URL: http://bazarr:6767 + PROWLARR_API_KEY: ${PROWLARR_API_KEY} + PROWLARR_URL: http://prowlarr:9696 + RADARR_API_KEY: ${RADARR_API_KEY} + RADARR_URL: http://radarr:7878 + READARR_API_KEY: ${READARR_API_KEY} + READARR_URL: http://readarr:8787 + SONARR_API_KEY: ${SONARR_API_KEY} + SONARR_URL: http://sonarr:8989 + image: ghcr.io/thecfu/scraparr:latest + ports: + - 7100:7100 + profiles: ["rinoa-apps"] + restart: unless-stopped scrutiny: cap_add: - SYS_RAWIO -- 2.52.0 From c620b42570432faa47248601553f028ce2d103b3 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:36:27 -0400 Subject: [PATCH 2/9] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index cb7c3f07..565babcd 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -5,17 +5,17 @@ on: push: branches-ignore: - 'main' + - 'renovate/**' paths: - '**/docker-compose.yml' env: FLARECTL_VERSION: '0.115.0' - HC_VAULT_VERSION: '1.20.0' + HC_VAULT_VERSION: '1.18.0' TEA_VERSION: '0.10.1' jobs: check-and-create-pr: - if: github.ref != 'refs/heads/main' && !startsWith(github.ref_name, 'renovate/') && github.actor != 'renovate-bot' name: Check and Create PR runs-on: ubuntu-latest steps: @@ -32,6 +32,7 @@ jobs: key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} - name: Install tea + if: steps.cache-tea.outputs.cache-hit != 'true' uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 @@ -357,7 +358,7 @@ jobs: pr-merge: name: PR Merge needs: [regenerate-readme-modified-services] - if: github.ref != 'refs/heads/main' && !startsWith(github.ref_name, 'renovate/') && github.actor != 'renovate-bot' + if: github.ref != 'refs/heads/main' runs-on: ubuntu-latest steps: - name: Checkout @@ -371,6 +372,7 @@ jobs: key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} - name: Install tea + if: steps.cache-tea.outputs.cache-hit != 'true' uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 @@ -415,7 +417,7 @@ jobs: docker-compose-deploy: name: Docker Compose Deployment runs-on: ubuntu-latest - needs: [generate-service-list, docker-compose-dry-run] + needs: [generate-service-list, docker-compose-dry-run, pr-merge] env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} -- 2.52.0 From 865b107255de0517785e8671729ac4d984eb4f40 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:40:57 -0400 Subject: [PATCH 3/9] ... --- .../workflows/pr-cloudflare-docker-deploy.yml | 1 - docker-compose.yml | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 565babcd..d63abe69 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -5,7 +5,6 @@ on: push: branches-ignore: - 'main' - - 'renovate/**' paths: - '**/docker-compose.yml' diff --git a/docker-compose.yml b/docker-compose.yml index 794d7ec3..65e4bce0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5672,11 +5672,21 @@ services: scraparr: container_name: scraparr depends_on: - - bazarr - - prowlarr - - radarr - - readarr - - sonarr + bazarr: + condition: service_started + required: true + prowlarr: + condition: service_started + required: true + radarr: + condition: service_started + required: true + readarr: + condition: service_started + required: true + sonarr: + condition: service_started + required: true environment: BAZARR_API_KEY: ${BAZARR_API_KEY} BAZARR_URL: http://bazarr:6767 -- 2.52.0 From 6de48e069c806ee786dcb5d230c093db176cbc0f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:46:00 -0400 Subject: [PATCH 4/9] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 -- docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index d63abe69..febab9f1 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -31,7 +31,6 @@ jobs: key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} - name: Install tea - if: steps.cache-tea.outputs.cache-hit != 'true' uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 @@ -437,7 +436,6 @@ jobs: key: vault-${{ runner.os }}-${{ env.HC_VAULT_VERSION }} - name: Install Vault (only if not cached) - if: steps.cache-vault.outputs.cache-hit != 'true' uses: cpanato/vault-installer@main with: version: ${{ env.HC_VAULT_VERSION }} diff --git a/docker-compose.yml b/docker-compose.yml index 65e4bce0..6169a2ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5698,7 +5698,7 @@ services: READARR_URL: http://readarr:8787 SONARR_API_KEY: ${SONARR_API_KEY} SONARR_URL: http://sonarr:8989 - image: ghcr.io/thecfu/scraparr:latest + image: ghcr.io/thecfu/scraparr:v2.2.4 ports: - 7100:7100 profiles: ["rinoa-apps"] -- 2.52.0 From e12589b9374de1a4cc33a99629336bb3b9fbb25d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:48:14 -0400 Subject: [PATCH 5/9] ... --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6169a2ac..be791eb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5698,7 +5698,7 @@ services: READARR_URL: http://readarr:8787 SONARR_API_KEY: ${SONARR_API_KEY} SONARR_URL: http://sonarr:8989 - image: ghcr.io/thecfu/scraparr:v2.2.4 + image: ghcr.io/thecfu/scraparr:2.2.4 ports: - 7100:7100 profiles: ["rinoa-apps"] -- 2.52.0 From d573d185f58045bdf047b8b170a30ceba6961edd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:51:23 -0400 Subject: [PATCH 6/9] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index febab9f1..8bdec317 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -324,7 +324,7 @@ jobs: - name: Generate service list run: | - yq '.services|to_entries|map({service:.key,image:.value.image,description:(.value.labels."homepage.description"//null)})' docker-compose.yml + yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml - name: Generate Markdown Table uses: gazab/create-markdown-table@v1 diff --git a/docker-compose.yml b/docker-compose.yml index be791eb7..374a65aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5698,7 +5698,7 @@ services: READARR_URL: http://readarr:8787 SONARR_API_KEY: ${SONARR_API_KEY} SONARR_URL: http://sonarr:8989 - image: ghcr.io/thecfu/scraparr:2.2.4 + image: ghcr.io/thecfu/scraparr:2 ports: - 7100:7100 profiles: ["rinoa-apps"] -- 2.52.0 From a0c03a517bafc3f8efd2577e6c1b5f04f7a8fb81 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 4 Sep 2025 01:53:11 +0000 Subject: [PATCH 7/9] chore: Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b2783ead..8a13ee7f 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ | romm-valkey | docker.io/bitnami/valkey:latest | | sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest | | sablier | sablierapp/sablier:latest | +| scraparr | ghcr.io/thecfu/scraparr:2 | | scrutiny | ghcr.io/analogj/scrutiny:master-omnibus | | searxng | searxng/searxng:latest | | searxng-valkey | docker.io/bitnami/valkey:latest | -- 2.52.0 From 860c61255752d68611dde88f435ac98fe58abe58 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 3 Sep 2025 21:59:03 -0400 Subject: [PATCH 8/9] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 - docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 8bdec317..4aa67893 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -370,7 +370,6 @@ jobs: key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} - name: Install tea - if: steps.cache-tea.outputs.cache-hit != 'true' uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 diff --git a/docker-compose.yml b/docker-compose.yml index 374a65aa..ba5184bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6216,7 +6216,7 @@ services: PUID: ${PUID} PGID: ${PGID} TZ: ${TZ} - image: git.trez.wtf/trez.one/soularr-dashboard:v0.1 + image: ghcr.io/mrusse/soularr:main labels: homepage.name: Soularr homepage.group: Downloaders -- 2.52.0 From fed2b0688d647cbb35e5874140c856c1730bbed0 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 4 Sep 2025 02:01:44 +0000 Subject: [PATCH 9/9] chore: Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a13ee7f..d9f38f7e 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ | sonarr | lscr.io/linuxserver/sonarr:latest | | sonashow | thewicklowwolf/sonashow:latest | | soularr | mrusse08/soularr:latest | -| soularr-dashboard | git.trez.wtf/trez.one/soularr-dashboard:v0.1 | +| soularr-dashboard | ghcr.io/mrusse/soularr:main | | soulseek | slskd/slskd | | speedtest-tracker | lscr.io/linuxserver/speedtest-tracker:latest | | stable-diffusion-webui | ghcr.io/neggles/sd-webui-docker:latest | -- 2.52.0