From 2935c39f3a49ee0b353ff7f0e103bcdb6f4a1d9e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 19:46:23 -0400 Subject: [PATCH 1/8] Switching Valkey image from Bitnami. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e5042fc..087b657 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -244,7 +244,7 @@ services: container_name: renovate-valkey healthcheck: test: redis-cli ping || exit 1 - image: docker.io/bitnami/valkey:latest + image: docker.io/valkey/valkey:8-alpine@sha256:d827e7f7552cdee40cc7482dbae9da020f42bc47669af6f71182a4ef76a22773 environment: ALLOW_EMPTY_PASSWORD: yes VALKEY_DATA_DIR: /data/valkey From 991ebaf200c5af6990692afc930dbfaa91e77a67 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 20:39:33 -0400 Subject: [PATCH 2/8] Removing digest for now. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 087b657..7db9da6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -244,7 +244,7 @@ services: container_name: renovate-valkey healthcheck: test: redis-cli ping || exit 1 - image: docker.io/valkey/valkey:8-alpine@sha256:d827e7f7552cdee40cc7482dbae9da020f42bc47669af6f71182a4ef76a22773 + image: docker.io/valkey/valkey:8-alpine environment: ALLOW_EMPTY_PASSWORD: yes VALKEY_DATA_DIR: /data/valkey From 1f0b642bbcd0d5e8118b971a1874770c7f11d5ef Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 20:40:57 -0400 Subject: [PATCH 3/8] Removing pre-pull step. --- .gitea/workflows/pr-docker-deploy.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index e181e21..b31806b 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -182,11 +182,6 @@ jobs: HC_VAULT_PASSWORD: ${{ secrets.VAULT_GITEA_PASSWORD }} HC_VAULT_SECRETS_PATH: rikku-docker/env - - name: Pre-pull/build service images in parallel - uses: https://git.trez.wtf/Trez/docker-select-image-pull@main - with: - services: ${{ env.DOCKER_SVC_LIST }} - - name: Docker Compose Dry Run uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0 with: From 8ef9968cbbd25f685c84bc14c2f30a0cfcb55ebb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 20:42:37 -0400 Subject: [PATCH 4/8] ... --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7db9da6..8d50f4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,6 @@ services: container_name: castsponsorskip image: ghcr.io/gabe565/castsponsorskip:0.8.2@sha256:fe3a1b45987168b9cbccc394496e42bed5d396cd4869aa70ea402c686e679403 environment: - # Set the container timezone # See identifier list at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones TZ: ${TZ} # CSS_PAUSED_INTERVAL: From b3d5d9b435fc649c252f113c029683a5e9106aca Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 20:50:12 -0400 Subject: [PATCH 5/8] .... --- .gitea/workflows/pr-docker-deploy.yml | 3 --- docker-compose.yml | 1 - 2 files changed, 4 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index b31806b..a9119b3 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -364,9 +364,6 @@ jobs: ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} args: --remove-orphans -d ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: ".env" - registry_host: "ghcr.io" - registry_user: TrezOne - registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }} summary: true - name: Docker Compose Healthcheck diff --git a/docker-compose.yml b/docker-compose.yml index 8d50f4c..f5e074d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,6 @@ services: container_name: castsponsorskip image: ghcr.io/gabe565/castsponsorskip:0.8.2@sha256:fe3a1b45987168b9cbccc394496e42bed5d396cd4869aa70ea402c686e679403 environment: - # See identifier list at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones TZ: ${TZ} # CSS_PAUSED_INTERVAL: # CSS_PLAYING_INTERVAL: From 251ae539d15a2f127b8a6666ca4cc706ccae466d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 21:04:14 -0400 Subject: [PATCH 6/8] ..... --- .gitea/workflows/pr-docker-deploy.yml | 3 --- docker-compose.yml | 9 --------- 2 files changed, 12 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index a9119b3..63c6acd 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -193,9 +193,6 @@ jobs: ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: ".env" - registry_host: "ghcr.io" - registry_user: TrezOne - registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }} summary: true - name: Gotify Notification diff --git a/docker-compose.yml b/docker-compose.yml index f5e074d..78d534d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,15 +13,6 @@ services: image: adguard/adguardhome:v0.107.67@sha256:927dc14b3e3cbd359e84658914590270a77d54446a6565e9498bef3444c286a4 network_mode: host privileged: true - # ports: - # - "192.168.1.254:53:53/udp" - # - "192.168.1.254:53:53/tcp" - # - 3001:3000 - # - "192.168.1.254:446:443/tcp" - # - 8008:80 - # - "192.168.1.254:853:853/tcp" - # - 67:67 - # - 688:68 restart: unless-stopped volumes: - /etc/localtime:/etc/localtime:ro From bed6b03911a91ca9d4a51ead42c99a034c98ad17 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 21:21:55 -0400 Subject: [PATCH 7/8] ...... --- .gitea/workflows/pr-docker-deploy.yml | 19 +++++++++++++++++++ docker-compose.yml | 2 -- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 63c6acd..1d20fbc 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -147,12 +147,16 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Login to GitHub Container Registry uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: registry: ghcr.io username: ${{ secrets.GHCR_USER }} @@ -160,6 +164,8 @@ jobs: - name: Login to Private Gitea Registry uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: registry: git.trez.wtf username: ${{ secrets.BOT_GITEA_USER }} @@ -182,6 +188,13 @@ jobs: HC_VAULT_PASSWORD: ${{ secrets.VAULT_GITEA_PASSWORD }} HC_VAULT_SECRETS_PATH: rikku-docker/env + - name: Pre-pull/build service images in parallel + uses: https://git.trez.wtf/Trez/docker-select-image-pull@main + env: + DOCKER_HOST: tcp://192.168.1.252:2375 + with: + services: ${{ env.DOCKER_SVC_LIST }} + - name: Docker Compose Dry Run uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0 with: @@ -315,12 +328,16 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Login to GitHub Container Registry uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: registry: ghcr.io username: ${{ secrets.GHCR_USER }} @@ -328,6 +345,8 @@ jobs: - name: Login to Private Gitea Registry uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + env: + DOCKER_HOST: tcp://192.168.1.252:2375 with: registry: git.trez.wtf username: ${{ secrets.BOT_GITEA_USER }} diff --git a/docker-compose.yml b/docker-compose.yml index 78d534d..635dfb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -143,8 +143,6 @@ services: TZ: ${TZ} HASS_URL: http://192.168.1.252:8123 image: ghcr.io/matt8707/ha-fusion:2024.10.1@sha256:5eea4634ab2b1e7c7523943996d13318d109b293abe8e9e86c38daf5c41830cb - labels: - com.centurylinklabs.watchtower.monitor-only: true ports: - 5050:5050 restart: unless-stopped From ecc9e6790056cdaea096340f59dcd334ed64e4b4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 21:32:49 -0400 Subject: [PATCH 8/8] ....... --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 635dfb4..baa125e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,14 +50,14 @@ services: docker-socket-proxy: container_name: dockerproxy environment: - AUTH: 0 - BUILD: 0 + AUTH: 1 + BUILD: 1 COMMIT: 0 CONFIGS: 0 CONTAINERS: 1 - DISTRIBUTION: 0 + DISTRIBUTION: 1 EVENTS: 0 - EXEC: 0 + EXEC: 1 GPRC: 0 IMAGES: 1 INFO: 1 @@ -65,11 +65,11 @@ services: NODES: 0 POST: 0 PLUGINS: 0 - SERVICES: 0 + SERVICES: 1 SESSION: 0 - SYSTEM: 0 - TASKS: 0 - VOLUMES: 0 + SYSTEM: 1 + TASKS: 1 + VOLUMES: 1 LOG_LEVEL: debug image: ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e ports: