diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 33fd259..66643c0 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -3,6 +3,7 @@ name: Deploy on: push: branches: + - dev - main # Adjust the branch as needed jobs: @@ -16,6 +17,8 @@ jobs: run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro - name: Build and push Docker images + env: + BRANCH: ${{ gitea.ref_name }} run: | docker compose build docker compose push @@ -33,18 +36,21 @@ jobs: - name: SSH into host down-up docker uses: appleboy/ssh-action@master env: - NUXT_PUBLIC_API_BASE: 'https://mns.kustarshina.ru/kp' - NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru' - NUXT_PUBLIC_BASE_URL: 'https://kupizabor.kustarshina.ru' + BRANCH: ${{ gitea.ref_name }} + HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }} + DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }} + NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' }}kustarshina.ru/kp + NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' }}kustarshina.ru + NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' }}kustarshina.ru NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }} with: host: ${{ secrets.SSH_HOST }} username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} # port: ${{ secrets.SSH_PORT }} - envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID + envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID, HOSTING_PATH, DOCKER_PORT, BRANCH script: | - cd /home/svs-adm/mns-mini-zabor + cd $HOSTING_PATH docker compose down docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro docker compose pull diff --git a/compose.yaml b/compose.yaml index c8be317..8af857b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,10 +4,10 @@ services: context: ./ dockerfile: Dockerfile # env_file: ".env" - container_name: mns-mini-zabor + container_name: mns_mini_zabor_${BRANCH} restart: always ports: - - "8103:3000" + - "${DOCKER_PORT}:3000" volumes: - ./.env:/src/.env image: ci.svs-tech.pro/mns-mini-zabor:latest