diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ec52cd4..408cf14 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -5,7 +5,7 @@ on: jobs: build-and-deploy: - # Указываем точные метки, которые мы видим в настройках + # Мы используем точную метку твоего раннера из настроек runs-on: ubuntu-22.04 steps: @@ -14,22 +14,21 @@ jobs: - name: Build Docker Image run: | - # Автоматический выбор тега + # Собираем образ прямо на сервере TAG=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest") docker build -t jambotron-app:$TAG . - name: Deploy Monolith run: | + # Твоя логика деплоя if [[ "${{ github.ref }}" == "refs/heads/production" ]]; then NAME="jambotron-prod" - DB="jambotron_prod" + DB_DB="jambotron_prod" DOMAIN="jambotron.com" - TAG="prod-latest" else NAME="jambotron-staging" - DB="jambotron_stg" + DB_DB="jambotron_stg" DOMAIN="staging.jambotron.com" - TAG="stg-latest" fi docker stop $NAME || true @@ -41,9 +40,9 @@ jobs: --restart always \ -v /var/run/docker.sock:/var/run/docker.sock \ -e SPRING_PROFILES_ACTIVE=prod \ - -e SPRING_DATASOURCE_URL=jdbc:postgresql://jambotron-db-server:5432/$DB \ + -e SPRING_DATASOURCE_URL=jdbc:postgresql://jambotron-db-server:5432/$DB_DB \ -e SPRING_DATASOURCE_USERNAME=jambotron_admin \ -e SPRING_DATASOURCE_PASSWORD=jambo_secret_pass \ -l "caddy=$DOMAIN" \ -l 'caddy.reverse_proxy={{upstreams 8081}}' \ - jambotron-app:$TAG \ No newline at end of file + jambotron-app:$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest") \ No newline at end of file