.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -10,12 +10,11 @@ on:
 
 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:
@@ -325,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
@@ -357,7 +356,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
@@ -415,7 +414,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 }}
@@ -436,7 +435,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 }}

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 |
@@ -180,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 |

docker-compose.yml

@@ -5669,6 +5669,40 @@ 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:
+        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
+      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:2
+    ports:
+      - 7100:7100
+    profiles: ["rinoa-apps"]
+    restart: unless-stopped
   scrutiny:
     cap_add:
       - SYS_RAWIO
@@ -6182,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