diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 408cf14..083fd2f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -5,32 +5,30 @@ on: jobs: build-and-deploy: - # Мы используем точную метку твоего раннера из настроек - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + # Возвращаем контейнер, НО с магической опцией проброса сокета + container: + image: catthehacker/ubuntu:act-latest + options: -v /var/run/docker.sock:/var/run/docker.sock steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Docker Image + - name: Install Docker CLI + run: | + # Внутри образа act-latest нет Docker CLI, ставим его быстро + apt-get update && apt-get install -y docker.io + + - name: Build and Deploy run: | - # Собираем образ прямо на сервере TAG=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest") + NAME=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "jambotron-prod" || echo "jambotron-staging") + DB=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "jambotron_prod" || echo "jambotron_stg") + DOMAIN=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "jambotron.com" || echo "staging.jambotron.com") + docker build -t jambotron-app:$TAG . - - - name: Deploy Monolith - run: | - # Твоя логика деплоя - if [[ "${{ github.ref }}" == "refs/heads/production" ]]; then - NAME="jambotron-prod" - DB_DB="jambotron_prod" - DOMAIN="jambotron.com" - else - NAME="jambotron-staging" - DB_DB="jambotron_stg" - DOMAIN="staging.jambotron.com" - fi - + docker stop $NAME || true docker rm $NAME || true @@ -40,9 +38,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_DB \ + -e SPRING_DATASOURCE_URL=jdbc:postgresql://jambotron-db-server:5432/$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:$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest") \ No newline at end of file + jambotron-app:$TAG \ No newline at end of file