From ae63e4cb3bdc43aa6646b6b7d674a6a0414e50af Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Wed, 2 Jul 2025 21:20:00 +0300
Subject: [PATCH] workflow: update deploy

---
 .github/workflows/deploy.yml | 17 +++++++++++++----
 docker-compose.dev.yml       | 19 +++++++++++++++++++
 docker-compose.yml           |  4 ++--
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 007cdb1..c9af671 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,6 +13,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Create fake .env file for build
+        run: |
+          echo "BOT_TOKEN=fake" > .env
+          echo "LOGIN_GRAPHQL=fake" >> .env
+          echo "PASSWORD_GRAPHQL=fake" >> .env
+          echo "URL_GRAPHQL=http://localhost/graphql" >> .env
+          echo "EMAIL_GRAPHQL=fake@example.com" >> .env
+          echo "NEXTAUTH_SECRET=fakesecret" >> .env
+
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
@@ -52,14 +61,14 @@ jobs:
         run: |
           ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "mkdir -p /home/${{ secrets.VPS_USER }}/zapishis"
 
-      - name: Create .env file
+      - name: Create real .env file for production
         run: |
           echo "BOT_TOKEN=${{ secrets.BOT_TOKEN }}" > .env
           echo "LOGIN_GRAPHQL=${{ secrets.LOGIN_GRAPHQL }}" >> .env
           echo "PASSWORD_GRAPHQL=${{ secrets.PASSWORD_GRAPHQL }}" >> .env
           echo "URL_GRAPHQL=${{ secrets.URL_GRAPHQL }}" >> .env
-          echo "__DEV_TELEGRAM_ID=${{ secrets.__DEV_TELEGRAM_ID }}" >> .env
-          echo "NODE_ENV=production" >> .env
+          echo "EMAIL_GRAPHQL=${{ secrets.EMAIL_GRAPHQL }}" >> .env
+          echo "NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }}" >> .env
 
       - name: Copy .env to VPS via SCP
         uses: appleboy/scp-action@master
@@ -88,4 +97,4 @@ jobs:
             docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} && \
             docker compose pull && \
             docker compose up -d
-          " 
\ No newline at end of file
+          "
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..b759d24
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,19 @@
+services:
+  web:
+    container_name: web
+    env_file:
+      - .env
+    build:
+      context: .
+      dockerfile: ./apps/web/Dockerfile
+    restart: always
+    ports:
+      - 3000:3000
+  bot:
+    container_name: bot
+    env_file:
+      - .env
+    build:
+      context: .
+      dockerfile: ./apps/bot/Dockerfile
+    restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index b759d24..13eee45 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   web:
-    container_name: web
+    image: vchikalkin/zapishis-web:latest
     env_file:
       - .env
     build:
@@ -10,7 +10,7 @@ services:
     ports:
       - 3000:3000
   bot:
-    container_name: bot
+    image: vchikalkin/zapishis-bot:latest
     env_file:
       - .env
     build: