From 9738b59543c2003c355f949e0bbed39711697397 Mon Sep 17 00:00:00 2001 From: Luke Else Date: Wed, 22 Jul 2026 00:23:42 +0100 Subject: [PATCH] chore: Refined final deployment stats --- services/dev/spinup.sh | 5 +++-- services/prod/backup-docker-compose.yml | 1 - services/prod/web-docker-compose.yml | 19 ------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/services/dev/spinup.sh b/services/dev/spinup.sh index 22044b8..f25d991 100755 --- a/services/dev/spinup.sh +++ b/services/dev/spinup.sh @@ -17,8 +17,9 @@ docker compose -f traefik-docker-compose.yml pull && docker compose -f traefik-d docker compose -f gitea-docker-compose.yml pull && docker compose -f gitea-docker-compose.yml up -d echo "Waiting for Gitea to become ready..." +sleep 20 for i in $(seq 1 30); do - if docker exec gitea gitea admin user list >/dev/null 2>&1; then + if docker exec -u 1000:1000 gitea gitea admin user list >/dev/null 2>&1; then break fi sleep 2 @@ -27,7 +28,7 @@ done # Generate a fresh Actions runner registration token straight from Gitea and # hand it to the runner containers via .env (docker compose auto-loads this) - # no manual copy/paste from the admin UI needed. -RUNNER_TOKEN=$(docker exec gitea gitea actions generate-runner-token) +RUNNER_TOKEN=$(docker exec -u 1000:1000 gitea gitea actions generate-runner-token) echo "GITEA_RUNNER_REGISTRATION_TOKEN=$RUNNER_TOKEN" > Runners/.env cd Runners diff --git a/services/prod/backup-docker-compose.yml b/services/prod/backup-docker-compose.yml index 7263c2b..0515547 100644 --- a/services/prod/backup-docker-compose.yml +++ b/services/prod/backup-docker-compose.yml @@ -22,7 +22,6 @@ services: - bitwarden_data:/backup/bitwarden_data:ro - rustdesk_data:/backup/rustdesk_data:ro - uptime_kuma_data:/backup/uptime_kuma_data:ro - - snexo_data:/backup/snexo_data:ro - letsencrypt_data:/backup/letsencrypt_data:ro - /var/run/docker.sock:/var/run/docker.sock:ro restart: unless-stopped diff --git a/services/prod/web-docker-compose.yml b/services/prod/web-docker-compose.yml index e4edb7f..93af14c 100644 --- a/services/prod/web-docker-compose.yml +++ b/services/prod/web-docker-compose.yml @@ -58,25 +58,6 @@ services: - "traefik.http.routers.metarius.tls.certresolver=myresolver" restart: unless-stopped - divine-couture: - image: git.luke-else.co.uk/luke-else/divine-couture.co.uk:latest - container_name: divine-couture - networks: - - proxy - labels: - ## Expose divine-couture Through Trefik ## - - "traefik.enable=true" # <== Enable traefik to proxy this container - - - "traefik.http.middlewares.redirect-web-secure.redirectscheme.scheme=https" - - "traefik.http.routers.divine-couture-insecure.middlewares=redirect-web-secure" - - "traefik.http.routers.divine-couture-insecure.rule=Host(`www.divine-couture.co.uk`)" - - "traefik.http.routers.divine-couture-insecure.entrypoints=web" - - - "traefik.http.routers.divine-couture.rule=Host(`www.divine-couture.co.uk`)" - - "traefik.http.routers.divine-couture.entrypoints=websecure" - - "traefik.http.routers.divine-couture.tls.certresolver=myresolver" - restart: unless-stopped - networks: proxy: external: true