Feat/open tofu #8

Merged
luke-else merged 24 commits from feat/open-tofu into main 2026-07-22 00:10:01 +00:00
3 changed files with 3 additions and 22 deletions
Showing only changes of commit 9738b59543 - Show all commits
+3 -2
View File
@@ -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 docker compose -f gitea-docker-compose.yml pull && docker compose -f gitea-docker-compose.yml up -d
echo "Waiting for Gitea to become ready..." echo "Waiting for Gitea to become ready..."
sleep 20
for i in $(seq 1 30); do 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 break
fi fi
sleep 2 sleep 2
@@ -27,7 +28,7 @@ done
# Generate a fresh Actions runner registration token straight from Gitea and # Generate a fresh Actions runner registration token straight from Gitea and
# hand it to the runner containers via .env (docker compose auto-loads this) - # hand it to the runner containers via .env (docker compose auto-loads this) -
# no manual copy/paste from the admin UI needed. # 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 echo "GITEA_RUNNER_REGISTRATION_TOKEN=$RUNNER_TOKEN" > Runners/.env
cd Runners cd Runners
-1
View File
@@ -22,7 +22,6 @@ services:
- bitwarden_data:/backup/bitwarden_data:ro - bitwarden_data:/backup/bitwarden_data:ro
- rustdesk_data:/backup/rustdesk_data:ro - rustdesk_data:/backup/rustdesk_data:ro
- uptime_kuma_data:/backup/uptime_kuma_data:ro - uptime_kuma_data:/backup/uptime_kuma_data:ro
- snexo_data:/backup/snexo_data:ro
- letsencrypt_data:/backup/letsencrypt_data:ro - letsencrypt_data:/backup/letsencrypt_data:ro
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
restart: unless-stopped restart: unless-stopped
-19
View File
@@ -58,25 +58,6 @@ services:
- "traefik.http.routers.metarius.tls.certresolver=myresolver" - "traefik.http.routers.metarius.tls.certresolver=myresolver"
restart: unless-stopped 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: networks:
proxy: proxy:
external: true external: true