diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index e181e21..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 }} @@ -184,6 +190,8 @@ jobs: - 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 }} @@ -198,9 +206,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 @@ -323,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 }} @@ -336,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 }} @@ -369,9 +380,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/README.md b/README.md index 7ecf2f0..d97c07d 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,17 @@ | Service | Image | | --- | --- | -| adguard | adguard/adguardhome:v0.107.66@sha256:cc8757742e547c722bb0bd9a3b11fce22771a75a5b0e07ce9a789ad62a2bfd37 | +| adguard | adguard/adguardhome:v0.107.67@sha256:927dc14b3e3cbd359e84658914590270a77d54446a6565e9498bef3444c286a4 | | beszel-agent | henrygd/beszel-agent:0.12.12@sha256:0830d9eb7866d3dfe810d8a8ed4fc3dad2c51b3bc855e3558a9aa4e8886c99be | | 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:e1f6aa1179c1e0f5003b3986e6ae5c15ae5605cbb5c38819fa3520feada6d078 | +| dockflare | alplat/dockflare:stable@sha256:8c419e698cdf4160b7043197b1d674cdf82910fdc4e249ff52da3cf86f5b5383 | | 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.2@sha256:1b80cecb262ee3be70474130aaff1e4949dab741c74b94e819d3f2a2ba520f29 | -| portainer-agent | portainer/agent:latest@sha256:ff968fbc40c78f8a822e1e6007e9f0e451b05263fed0639d7e37cbf6f4666b13 | -| renovate | renovate/renovate:41.97.12-full@sha256:e20639264151d9dce8f0fc3b1219748f4844a76cc157263551d8e7e061daa60e | -| renovate-valkey | docker.io/bitnami/valkey:latest | +| homeassistant | ghcr.io/home-assistant/home-assistant:stable@sha256:ae0e2a2f03822c49a0c506bc40e367b4abc8b3207d67a6e0312b42d60867c5e5 | +| ollama | ollama/ollama:0.12.3@sha256:c622a7adec67cf5bd7fe1802b7e26aa583a955a54e91d132889301f50c3e0bd0 | +| portainer-agent | portainer/agent:latest@sha256:a454c023f4b79ae308e372e5a4ab0d37961d6d8ad88fe5945544435203ded198 | +| renovate | renovate/renovate:41.131.12-full@sha256:d7f82f222b7ef6bd9a4166d7428aa82b42e0a5421d6797a417e2fef58bcf68e3 | +| renovate-valkey | docker.io/valkey/valkey:8-alpine | | 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 | diff --git a/docker-compose.yml b/docker-compose.yml index 60ed7f9..2b49ed7 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 @@ -48,8 +39,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: # CSS_PLAYING_INTERVAL: @@ -154,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 @@ -244,7 +231,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 environment: ALLOW_EMPTY_PASSWORD: yes VALKEY_DATA_DIR: /data/valkey