mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test new docker build #16

Merged
ksenia_mikhailova merged 9 commits from dev into main 2024-07-08 16:02:27 +03:00
Conversation 0 Commits 9 Files Changed 2 +13 -7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitea/workflows/deploy.yaml
View File

@ -3,6 +3,7 @@ name: Deploy
on: on:
push: push:
branches: branches:
- dev
- main # Adjust the branch as needed - main # Adjust the branch as needed
jobs: jobs:
@ -16,6 +17,8 @@ jobs:
run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro
- name: Build and push Docker images - name: Build and push Docker images
env:
BRANCH: ${{ gitea.ref_name }}
run: | run: |
docker compose build docker compose build
docker compose push docker compose push
@ -33,18 +36,21 @@ jobs:
- name: SSH into host down-up docker - name: SSH into host down-up docker
uses: appleboy/ssh-action@master uses: appleboy/ssh-action@master
env: env:
NUXT_PUBLIC_API_BASE: 'https://mns.kustarshina.ru/kp' BRANCH: ${{ gitea.ref_name }}
NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru' HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }}
NUXT_PUBLIC_BASE_URL: 'https://kupizabor.kustarshina.ru' 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 }} NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
with: with:
host: ${{ secrets.SSH_HOST }} host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USERNAME }} username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_PRIVATE_KEY }} key: ${{ secrets.SSH_PRIVATE_KEY }}
# port: ${{ secrets.SSH_PORT }} # 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: | script: |
cd /home/svs-adm/mns-mini-zabor cd $HOSTING_PATH
docker compose down docker compose down
docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro
docker compose pull docker compose pull

4
compose.yaml
View File

@ -4,10 +4,10 @@ services:
context: ./ context: ./
dockerfile: Dockerfile dockerfile: Dockerfile
# env_file: ".env" # env_file: ".env"
container_name: mns-mini-zabor container_name: mns_mini_zabor_${BRANCH}
restart: always restart: always
ports: ports:
- "8103:3000" - "${DOCKER_PORT}:3000"
volumes: volumes:
- ./.env:/src/.env - ./.env:/src/.env
image: ci.svs-tech.pro/mns-mini-zabor:latest image: ci.svs-tech.pro/mns-mini-zabor:latest