From c96ae0acf59085e34a1766a2ff666b4783201c05 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:28:45 +0300 Subject: [PATCH 1/6] test deploy --- .gitea/workflows/deploy.yaml | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .gitea/workflows/deploy.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..38f0b09 --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,65 @@ +name: Deploy + +on: + push: + branches: + - testing # Adjust the branch as needed + +jobs: + build_and_push_images: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Docker login + run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro + + - name: Build and push Docker images + run: | + docker compose build + docker compose push + + deploy_to_server_dev: + needs: [build_and_push_images] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Configure SSH key + run: | + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + - name: Copy files to host + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.SSH_HOST }} + username: ${{ secrets.SSH_USERNAME }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + port: ${{ secrets.SSH_PORT }} + source: "deploy/*,docker-compose.yml,nginx/nginx.conf" + target: /opt/app/ + + - name: SSH into host and execute script + uses: appleboy/ssh-action@master + env: + KASSA_ID: ${{ secrets.KASSA_ID_DEV }} + KASSA_TOKEN: ${{ secrets.KASSA_TOKEN_DEV }} + TICKET_DB: ${{ secrets.TICKET_DB_DEV }} + DB_USER_: ${{ secrets.DB_USER_DEV }} + DB_PASSWORD: ${{ secrets.DB_PASSWORD_DEV }} + TERMINAL_ID: 1 + with: + host: ${{ secrets.SSH_HOST }} + username: ${{ secrets.SSH_USERNAME }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + port: ${{ secrets.SSH_PORT }} + envs: KASSA_ID, KASSA_TOKEN, TICKET_DB, DB_USER, DB_PASSWORD, TERMINAL_ID + script: | + cd /opt/app/ + echo "restart container" + docker-compose down + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro + docker-compose pull + docker logout ci.svs-tech.pro + docker-compose up -d \ No newline at end of file -- 2.40.1 From 6137a056075e0cd1d8b427d28f8c165803033904 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:29:36 +0300 Subject: [PATCH 2/6] test deploy --- .gitea/workflows/deploy.yaml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 38f0b09..cfae964 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -3,7 +3,7 @@ name: Deploy on: push: branches: - - testing # Adjust the branch as needed + - dev # Adjust the branch as needed jobs: build_and_push_images: @@ -30,31 +30,16 @@ jobs: echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - - name: Copy files to host - uses: appleboy/scp-action@v0.1.7 - with: - host: ${{ secrets.SSH_HOST }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - port: ${{ secrets.SSH_PORT }} - source: "deploy/*,docker-compose.yml,nginx/nginx.conf" - target: /opt/app/ - - - name: SSH into host and execute script + - name: SSH into host down-up docker uses: appleboy/ssh-action@master env: KASSA_ID: ${{ secrets.KASSA_ID_DEV }} - KASSA_TOKEN: ${{ secrets.KASSA_TOKEN_DEV }} - TICKET_DB: ${{ secrets.TICKET_DB_DEV }} - DB_USER_: ${{ secrets.DB_USER_DEV }} - DB_PASSWORD: ${{ secrets.DB_PASSWORD_DEV }} - TERMINAL_ID: 1 with: host: ${{ secrets.SSH_HOST }} username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} port: ${{ secrets.SSH_PORT }} - envs: KASSA_ID, KASSA_TOKEN, TICKET_DB, DB_USER, DB_PASSWORD, TERMINAL_ID + envs: KASSA_ID script: | cd /opt/app/ echo "restart container" -- 2.40.1 From bd549539e452788b97b9e6ca9a65eff657f0d45d Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:30:41 +0300 Subject: [PATCH 3/6] set dir --- .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 cfae964..6366822 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -41,7 +41,7 @@ jobs: port: ${{ secrets.SSH_PORT }} envs: KASSA_ID script: | - cd /opt/app/ + cd /home/svs-adm/mns-mini-zabor echo "restart container" docker-compose down docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro -- 2.40.1 From 1ca551a6b9587f520c657a7fd2b7efe96c73f02c Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:32:02 +0300 Subject: [PATCH 4/6] env --- .gitea/workflows/deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 6366822..a9d10bd 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -33,7 +33,9 @@ jobs: - name: SSH into host down-up docker uses: appleboy/ssh-action@master env: - KASSA_ID: ${{ secrets.KASSA_ID_DEV }} + 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' with: host: ${{ secrets.SSH_HOST }} username: ${{ secrets.SSH_USERNAME }} -- 2.40.1 From 9f057690ffe5c2757593cbc10b11301cf5849bfd Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:33:07 +0300 Subject: [PATCH 5/6] env --- .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 a9d10bd..4438695 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -41,7 +41,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} port: ${{ secrets.SSH_PORT }} - envs: KASSA_ID + envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL script: | cd /home/svs-adm/mns-mini-zabor echo "restart container" -- 2.40.1 From db2bf98b7a1d7f1ef43cce5a7e6ea9b4bdd8d27a Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 4 Jul 2024 10:46:50 +0300 Subject: [PATCH 6/6] readme --- README.md | 81 +++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index f5db2a2..b3d4c6d 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,18 @@ -# Nuxt 3 Minimal Starter +# Kupizabor -Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more. +## Стек -## Setup +* vue3 +* nextjs +* threejs +* tresjs -Make sure to install the dependencies: +## Запуск -```bash -# npm -npm install +* npm run dev -# pnpm -pnpm install +## Env -# yarn -yarn install - -# bun -bun install -``` - -## Development Server - -Start the development server on `http://localhost:3000`: - -```bash -# npm -npm run dev - -# pnpm -pnpm run dev - -# yarn -yarn dev - -# bun -bun run dev -``` - -## Production - -Build the application for production: - -```bash -# npm -npm run build - -# pnpm -pnpm run build - -# yarn -yarn build - -# bun -bun run build -``` - -Locally preview production build: - -```bash -# npm -npm run preview - -# pnpm -pnpm run preview - -# yarn -yarn preview - -# bun -bun run preview -``` - -Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information. +* `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'` \ No newline at end of file -- 2.40.1