From 12c9a33829bbb9a36d32e220d6a4bfba06730a24 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 24 Sep 2025 10:06:06 -0400 Subject: [PATCH 1/3] Moving Renovate from Rinoa to Rikku. --- docker-compose.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 43ff84b..762c6d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -186,6 +186,53 @@ services: restart: unless-stopped volumes: - ollama:/root/.ollama + renovate: + container_name: renovate + environment: + # --- Authentication & platform --- + RENOVATE_TOKEN: "${RENOVATE_GITEA_TOKEN}" # Gitea personal access token for renovate-bot + RENOVATE_PLATFORM: "gitea" + RENOVATE_ENDPOINT: "https://git.${MY_TLD}/api/v1" # your Gitea URL + RENOVATE_USERNAME: "renovate-bot" + RENOVATE_GIT_AUTHOR: "Renovate Bot " + RENOVATE_GITHUB_COM_TOKEN: ${LIBRECHAT_GITHUB_TOKEN} + + # --- Behavior --- + RENOVATE_AUTODISCOVER: "true" # discover all repos renovate-bot has access to + RENOVATE_ONBOARDING: "true" # create onboarding PR if repo not configured + RENOVATE_REQUIRE_CONFIG: "optional" # run even if no renovate config exists + RENOVATE_REDIS_URL: redis://renovate-valkey:6379 + LOG_LEVEL: "info" + + # --- Enable dependency dashboard --- + RENOVATE_EXTENDS: "config:base,:dependencyDashboard" + + # --- Example package rules --- + RENOVATE_PRUNE_BRANCH_AFTER_AUTOMERG: false + RENOVATE_PRUNE_STALE_BRANCHES: true + + # --- Scheduling --- + # Renovate will only process PRs/updates in this time window + RENOVATE_SCHEDULE: '["after 2am and before 6am"]' + OTEL_EXPORTER_OTLP_ENDPOINT: http://signoz-otel-collector:4318 + OTEL_SERVICE_NAME: renovate + OTEL_SERVICE_NAMESPACE: renovate.${MY_TLD} + image: renovate/renovate:41.97.12-full@sha256:e20639264151d9dce8f0fc3b1219748f4844a76cc157263551d8e7e061daa60e + restart: unless-stopped + renovate-valkey: + container_name: renovate-valkey + healthcheck: + test: redis-cli ping || exit 1 + image: docker.io/bitnami/valkey:latest + environment: + ALLOW_EMPTY_PASSWORD: yes + VALKEY_DATA_DIR: /data/valkey + VALKEY_DATABASE: 0 + expose: + - 6379 + restart: unless-stopped + volumes: + - renovate-valkey-data:/data/valkey signoz-logspout: command: signoz://192.168.1.254:8082 container_name: signoz-logspout @@ -236,3 +283,5 @@ volumes: name: dockflare_data ollama: name: ollama + renovate-valkey-data: + name: renovate-valkey-data \ No newline at end of file -- 2.52.0 From b23ac731bebe6a97dbdd294eebd46ad5f67cfe71 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 24 Sep 2025 10:15:05 -0400 Subject: [PATCH 2/3] Registry login tweaks. --- .gitea/workflows/pr-docker-deploy.yml | 54 ++++++++++++++++--------- .gitea/workflows/renovate-pr-deploy.yml | 27 ++++++++----- 2 files changed, 51 insertions(+), 30 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 8d83af2..c71574d 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -150,18 +150,25 @@ jobs: # run: | # docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf - - name: Login to registries + - name: Login to Docker Hub uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: - registry-auth: | - - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - registry: ghcr.io - username: ${{ secrets.GHCR_USER }} - password: ${{ secrets.GHCR_LOGIN_TOKEN }} - - registry: git.trez.wtf - username: ${{ secrets.BOT_GITEA_USER }} - password: ${{ secrets.BOT_GITEA_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: ghcr.io + username: ${{ secrets.GHCR_USER }} + password: ${{ secrets.GHCR_LOGIN_TOKEN }} + + - name: Login to Private Gitea Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: git.trez.wtf + username: ${{ secrets.BOT_GITEA_USER }} + password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Cache Vault install id: cache-vault @@ -339,18 +346,25 @@ jobs: # run: | # docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf - - name: Login to registries + - name: Login to Docker Hub uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: - registry-auth: | - - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - registry: ghcr.io - username: ${{ secrets.GHCR_USER }} - password: ${{ secrets.GHCR_LOGIN_TOKEN }} - - registry: git.trez.wtf - username: ${{ secrets.BOT_GITEA_USER }} - password: ${{ secrets.BOT_GITEA_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: ghcr.io + username: ${{ secrets.GHCR_USER }} + password: ${{ secrets.GHCR_LOGIN_TOKEN }} + + - name: Login to Private Gitea Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: git.trez.wtf + username: ${{ secrets.BOT_GITEA_USER }} + password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Gotify Notification uses: eikendev/gotify-action@master diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index 0b0e2ba..5561a43 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -98,18 +98,25 @@ jobs: notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku" notification_message: "Starting Docker Compose run..." - - name: Login to registries + - name: Login to Docker Hub uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: - registry-auth: | - - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - registry: ghcr.io - username: ${{ secrets.GHCR_USER }} - password: ${{ secrets.GHCR_LOGIN_TOKEN }} - - registry: git.trez.wtf - username: ${{ secrets.BOT_GITEA_USER }} - password: ${{ secrets.BOT_GITEA_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: ghcr.io + username: ${{ secrets.GHCR_USER }} + password: ${{ secrets.GHCR_LOGIN_TOKEN }} + + - name: Login to Private Gitea Registry + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + with: + registry: git.trez.wtf + username: ${{ secrets.BOT_GITEA_USER }} + password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Docker Compose Deployment uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0 -- 2.52.0 From b0d958b90cbc02b47cb18dd291c4bc0dea17bddc Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 24 Sep 2025 14:20:38 +0000 Subject: [PATCH 3/3] chore: Update README --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9d37d19..b6973b3 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,17 @@ | Service | Image | | --- | --- | -| adguard | adguard/adguardhome:v0.107.65 | -| beszel-agent | henrygd/beszel-agent:0.12.7 | -| castsponsorskip | ghcr.io/gabe565/castsponsorskip:0.8.2 | -| docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest | -| dockflare | alplat/dockflare:stable | -| ha-fusion | ghcr.io/matt8707/ha-fusion:2024.10.1 | -| homeassistant | ghcr.io/home-assistant/home-assistant:stable | -| ollama | ollama/ollama:0.11.10 | -| signoz-logspout | pavanputhra/logspout-signoz:2025.07.19-887dfeb | -| upsnap | ghcr.io/seriousm4x/upsnap:5 | -| watchtower | ghcr.io/containrrr/watchtower:latest | -| webhook | thecatlady/webhook:2.8.1 | +| adguard | adguard/adguardhome:v0.107.66@sha256:cc8757742e547c722bb0bd9a3b11fce22771a75a5b0e07ce9a789ad62a2bfd37 | +| beszel-agent | henrygd/beszel-agent:0.12.10@sha256:6684cf709493b3728e329daaa669c8c386e9c2da324ce4ba3ef0c55c370fdbe5 | +| castsponsorskip | ghcr.io/gabe565/castsponsorskip:0.8.2@sha256:fe3a1b45987168b9cbccc394496e42bed5d396cd4869aa70ea402c686e679403 | +| docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e | +| dockflare | alplat/dockflare:stable@sha256:fa81f1f93c42843661c9cd3015b76120261e39e7df1d47612ae3be15f1d51831 | +| ha-fusion | ghcr.io/matt8707/ha-fusion:2024.10.1@sha256:5eea4634ab2b1e7c7523943996d13318d109b293abe8e9e86c38daf5c41830cb | +| homeassistant | ghcr.io/home-assistant/home-assistant:stable@sha256:89ec0583c7f47c8a150204f6b5ed48b5432026012bebe1226cf72775a795a5e1 | +| ollama | ollama/ollama:0.12.1@sha256:5aed793ab336d1aac9b132f4b46fddfcfa13b8911def3d275937c8acbd1763e8 | +| renovate | renovate/renovate:41.97.12-full@sha256:e20639264151d9dce8f0fc3b1219748f4844a76cc157263551d8e7e061daa60e | +| renovate-valkey | docker.io/bitnami/valkey:latest | +| signoz-logspout | pavanputhra/logspout-signoz:2025.07.19-887dfeb@sha256:6da8ce12279a5262de8b2d5c083ce82d4c878c4eab702b4d328afe147ed7553b | +| upsnap | ghcr.io/seriousm4x/upsnap:5@sha256:c96e9d3f1559736544f723d99b778498982ebb2819de8e509548f8c5468b5542 | +| webhook | thecatlady/webhook:2.8.1@sha256:2c20d15f8f1b87ea1fa242787af6f288175bbb3402a04f1744a7f7a6a529d711 | -- 2.52.0