From 9235c3bae18da561af34356b8ca5c15e58b2bf3c Mon Sep 17 00:00:00 2001
From: urec56 <mail@urec56.ru>
Date: Fri, 11 Apr 2025 22:56:15 +0300
Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=20ci/cd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .forgejo/workflows/deploy.yml    | 78 ++++++++++++++++----------------
 docker/deploy-docker-compose.yml |  4 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index 59f9cff..5f2fe80 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -38,6 +38,45 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Build and push backend
+        uses: https://git.urec56.ru/urec/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile_back
+          push: true
+          tags: ${{ needs.prepare.outputs.chat_back_image }}
+          cache-from: type=gha # type=registry,ref=git.urec56.ru/chat_back:buildcache
+          cache-to: type=gha,mode=max # type=registry,ref=git.urec56.ru/chat_back:buildcache,mode=max
+
+
+      - name: Build and push celery
+        uses: https://git.urec56.ru/urec/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile_celery
+          push: true
+          tags: ${{ needs.prepare.outputs.celery_image }}
+          cache-from: type=gha # type=registry,ref=git.urec56.ru/celery:buildcache
+          cache-to: type=gha,mode=max # type=registry,ref=git.urec56.ru/celery:buildcache,mode=max
+
+  
+  deploy:
+    runs-on: docker
+    needs:
+      - prepare
+      - build
+    
+    steps:
+      - name: Checkout repo
+        uses: https://git.urec56.ru/urec/checkout@v4
+
+      - name: Log in to container registry
+        uses: https://git.urec56.ru/urec/login-action@v3
+        with:
+          registry: git.urec56.ru
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Generate .env
         run: |
           touch .env
@@ -77,45 +116,6 @@ jobs:
           echo 'REGISTRATED_USER=${{ env.REGISTRATED_USER }}' >> .env
           echo 'VERIFICATED_USER=${{ env.VERIFICATED_USER }}' >> .env
 
-      - name: Build and push backend
-        uses: https://git.urec56.ru/urec/build-push-action@v6
-        with:
-          context: .
-          file: docker/Dockerfile_back
-          push: true
-          tags: ${{ needs.prepare.outputs.chat_back_image }}
-          cache-from: type=gha # type=registry,ref=git.urec56.ru/chat_back:buildcache
-          cache-to: type=gha,mode=max # type=registry,ref=git.urec56.ru/chat_back:buildcache,mode=max
-
-
-      - name: Build and push celery
-        uses: https://git.urec56.ru/urec/build-push-action@v6
-        with:
-          context: .
-          file: docker/Dockerfile_celery
-          push: true
-          tags: ${{ needs.prepare.outputs.celery_image }}
-          cache-from: type=gha # type=registry,ref=git.urec56.ru/celery:buildcache
-          cache-to: type=gha,mode=max # type=registry,ref=git.urec56.ru/celery:buildcache,mode=max
-
-  
-  deploy:
-    runs-on: docker
-    needs:
-      - prepare
-      - build
-    
-    steps:
-      - name: Checkout repo
-        uses: https://git.urec56.ru/urec/checkout@v4
-
-      - name: Log in to container registry
-        uses: https://git.urec56.ru/urec/login-action@v3
-        with:
-          registry: git.urec56.ru
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Pull and run container
         run: |
           export 'CHAT_BACK_IMAGE=${{ needs.prepare.outputs.chat_back_image }}'
diff --git a/docker/deploy-docker-compose.yml b/docker/deploy-docker-compose.yml
index 58a26b4..1aa09a5 100644
--- a/docker/deploy-docker-compose.yml
+++ b/docker/deploy-docker-compose.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - "127.0.0.1:8888:8000"
     env_file:
-      - .env
+      - ../.env
     restart: always
     depends_on:
       celery:
@@ -17,7 +17,7 @@ services:
     image: ${CHAT_CELERY_IMAGE}
     container_name: celery
     env_file:
-      - .env
+      - ../.env
     restart: always
     networks:
       - bp_chat