diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index bcb926e..46b7292 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,11 +24,15 @@ jobs: - name: Build and Deploy run: | # 1. СТРОГОЕ ОПРЕДЕЛЕНИЕ ПЕРЕМЕННЫХ ОКРУЖЕНИЯ - if [[ "${{ github.ref }}" == *"production"* ]]; then - D_NAME="jambotron-prod"; D_DB="jambotron_prod"; D_DOMAIN="jambotron.com"; D_TAG="prod-latest" - else - D_NAME="jambotron-staging"; D_DB="jambotron_stg"; D_DOMAIN="staging.jambotron.com"; D_TAG="stg-latest" - fi + if [[ "${{ github.ref }}" == *"production"* ]]; then + D_NAME="jambotron-prod"; D_DB="jambotron_prod"; D_DOMAIN="jambotron.com"; D_TAG="prod-latest" + # Для продакшена оставляем wildcard + CADDY_LABELS="$D_DOMAIN, *.$D_DOMAIN" + else + D_NAME="jambotron-staging"; D_DB="jambotron_stg"; D_DOMAIN="staging.jambotron.com"; D_TAG="stg-latest" + # Для стейджинга только основной домен + CADDY_LABELS="$D_DOMAIN" + fi echo "Starting созидание for $D_NAME with tag $D_TAG" @@ -48,7 +52,6 @@ jobs: docker stop $D_NAME || true docker rm $D_NAME || true - # 5. ЗАПУСК СИСТЕМЫ (МНОГОСТРОЧНЫЙ ФОРМАТ ДЛЯ CADDY) docker run -d --name $D_NAME --network jambotron-net --restart always \ -v /var/run/docker.sock:/var/run/docker.sock \ -v jambotron_data:/jambotron_data \ @@ -60,7 +63,7 @@ jobs: -e SPRING_FLYWAY_USER=jambotron_admin \ -e SPRING_FLYWAY_PASSWORD=jambo_secret_pass \ -e SPRING_DATA_MONGODB_URI=mongodb://jambotron_admin:jambo_mongo_secret@jambo-mongo:27017/jambotron?authSource=admin \ - -l "caddy=$D_DOMAIN, *.$D_DOMAIN" \ + -l "caddy=$CADDY_LABELS" \ -l "caddy.reverse_proxy={{upstreams 8081}}" \ jambotron-app:$D_TAG diff --git a/jambotron-ui/hetzner/caddy/docker-compose.yml b/jambotron-ui/hetzner/caddy/docker-compose.yml index edaa444..03144d5 100644 --- a/jambotron-ui/hetzner/caddy/docker-compose.yml +++ b/jambotron-ui/hetzner/caddy/docker-compose.yml @@ -1,10 +1,7 @@ services: # --- ЯДРО: Caddy с авто-лейблами --- caddy: - # Вместо image используем build - build: - context: . - dockerfile: Dockerfile-caddy + image: lucaslorentz/caddy-docker-proxy:latest container_name: caddy ports: - 80:80 @@ -85,15 +82,6 @@ services: caddy: test-app1.jambotron.com caddy.reverse_proxy: "{{upstreams 80}}" restart: always - loki: - image: grafana/loki:2.9.0 - container_name: jambo-loki - ports: - - "3100:3100" - command: -config.file=/etc/loki/local-config.yaml - networks: - - jambotron-net - restart: always networks: jambotron-net: @@ -102,4 +90,4 @@ networks: volumes: caddy_data: prometheus_data: - grafana_data: + grafana_data: \ No newline at end of file