From 9105593b450b4783ac1fa7092dc4ff9118d4cf72 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 14:05:52 +0300 Subject: [PATCH 1/9] build dev --- .gitea/workflows/deploy.yaml | 3 +++ compose.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 33fd259..d9553ba 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: @@ -33,6 +34,8 @@ jobs: - name: SSH into host down-up docker uses: appleboy/ssh-action@master env: + 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' || '8105' }} 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' diff --git a/compose.yaml b/compose.yaml index c8be317..01234b1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,7 +7,7 @@ services: container_name: mns-mini-zabor restart: always ports: - - "8103:3000" + - "${DOCKER_PORT}:3000" volumes: - ./.env:/src/.env image: ci.svs-tech.pro/mns-mini-zabor:latest From 7b4e8e4f9aa75eeed56a422537e7e424c59291f9 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 14:06:44 +0300 Subject: [PATCH 2/9] port --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index d9553ba..9aed322 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -35,7 +35,7 @@ jobs: uses: appleboy/ssh-action@master env: 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' || '8105' }} + DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }} 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' From 68b5e8ce4b9c4059b4d68eb80ada80796adab443 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 14:50:14 +0300 Subject: [PATCH 3/9] domain --- .gitea/workflows/deploy.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 9aed322..c97fa86 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -33,12 +33,13 @@ jobs: - name: SSH into host down-up docker uses: appleboy/ssh-action@master + base: &base ${{ gitea.ref_name == 'main' && "kustarshina.ru" || "dev.kustarshina.ru"}} env: 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.kustarshina.ru/kp' - NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru' - NUXT_PUBLIC_BASE_URL: 'https://kupizabor.kustarshina.ru' + NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ *base }}/kp + NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ *base }} + NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ *base }} NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }} with: host: ${{ secrets.SSH_HOST }} From 7951fee7a0f04a82536eb03cd81c1a094b4dd951 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 14:56:31 +0300 Subject: [PATCH 4/9] domain --- .gitea/workflows/deploy.yaml | 1 + compose.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index c97fa86..1e44f6d 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -35,6 +35,7 @@ jobs: uses: appleboy/ssh-action@master base: &base ${{ gitea.ref_name == 'main' && "kustarshina.ru" || "dev.kustarshina.ru"}} env: + 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.'}}${{ *base }}/kp diff --git a/compose.yaml b/compose.yaml index 01234b1..8af857b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,7 +4,7 @@ services: context: ./ dockerfile: Dockerfile # env_file: ".env" - container_name: mns-mini-zabor + container_name: mns_mini_zabor_${BRANCH} restart: always ports: - "${DOCKER_PORT}:3000" From 75f25207b4c270b7ea97ffa1389fb2ce0f52f811 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 15:00:51 +0300 Subject: [PATCH 5/9] domain --- .gitea/workflows/deploy.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 1e44f6d..4fe4fa1 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -33,14 +33,14 @@ jobs: - name: SSH into host down-up docker uses: appleboy/ssh-action@master - base: &base ${{ gitea.ref_name == 'main' && "kustarshina.ru" || "dev.kustarshina.ru"}} env: 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.'}}${{ *base }}/kp - NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ *base }} - NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ *base }} + WEB_BASE: ${{ gitea.ref_name == 'main' && "kustarshina.ru" || "dev.kustarshina.ru"}} + NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ env.BASE }}/kp + NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ env.BASE }} + NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ env.BASE }} NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }} with: host: ${{ secrets.SSH_HOST }} From 62056fa97a5f39730beb020eb2737e4cbee1b30b Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 15:05:31 +0300 Subject: [PATCH 6/9] domain --- .gitea/workflows/deploy.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4fe4fa1..67215ea 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -37,10 +37,9 @@ jobs: 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' }} - WEB_BASE: ${{ gitea.ref_name == 'main' && "kustarshina.ru" || "dev.kustarshina.ru"}} - NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ env.BASE }}/kp - NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ env.BASE }} - NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ env.BASE }} + 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 }} From 66293f8d527b098e71853cc035c2bce17820a373 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 15:08:58 +0300 Subject: [PATCH 7/9] domain --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 67215ea..0157fc7 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -48,7 +48,7 @@ jobs: # port: ${{ secrets.SSH_PORT }} envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID 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 From 98f4632d959271eccf43ed3159f3e81b7f813cf3 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 15:13:07 +0300 Subject: [PATCH 8/9] domain --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 0157fc7..34ee1dc 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -46,7 +46,7 @@ jobs: 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 $HOSTING_PATH docker compose down From d040b8fb8115e943646e774336feb5e5636df8bf Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 8 Jul 2024 15:20:21 +0300 Subject: [PATCH 9/9] docker name --- .gitea/workflows/deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 34ee1dc..66643c0 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -17,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