From 49f9e92cfe26f655a5a4717cfbec915e33592d87 Mon Sep 17 00:00:00 2001
From: urec56 <mail@urec56.ru>
Date: Fri, 11 Apr 2025 17:56:17 +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 | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index e73a5ea..bb61d77 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -5,8 +5,21 @@ env:
   CHAT_CELERY_IMAGE: 'git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}'
 
 jobs:
+  prepare:
+   runs-on: docker
+    outputs:
+      chat_back_image: ${{ steps.set-vars.outputs.chat_back_image }}
+      celery_image: ${{ steps.set-vars.outputs.celery_image }}
+    steps:
+      - name: Set vars
+        run: |
+          echo 'chat_back_image=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }}
+          echo 'celery_image=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }}
+
+
   build:
     runs-on: docker
+    needs: prepare
     steps:
       - name: Check env
         run: |
@@ -74,7 +87,7 @@ jobs:
           context: .
           file: docker/Dockerfile_back
           push: true
-          tags: ${{ env.CHAT_BACK_IMAGE }}
+          tags: ${{ needs.prepare.outputs.chat_back_image }}
           cache-from: type=registry,ref=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:buildcache
           cache-to: type=registry,ref=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:buildcache,mode=max
 
@@ -85,7 +98,7 @@ jobs:
           context: .
           file: docker/Dockerfile_celery
           push: true
-          tags: ${{ env.CHAT_CELERY_IMAGE }}
+          tags: ${{ needs.prepare.outputs.celery_image }}
           cache-from: type=registry,ref=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:buildcache
           cache-to: type=registry,ref=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:buildcache,mode=max
 
@@ -93,6 +106,7 @@ jobs:
   deploy:
     runs-on: docker
     needs:
+      - prepare
       - build
     
     steps:
@@ -108,8 +122,11 @@ jobs:
 
       - name: Pull and run container
         run: |
-          docker pull ${{ env.CHAT_BACK_IMAGE }}
-          docker pull ${{ env.CHAT_CELERY_IMAGE }}
+          CHAT_BACK_IMAGE=${{ needs.prepare.outputs.chat_back_image }}
+          CHAT_CELERY_IMAGE=${{ needs.prepare.outputs.celery_image }}
+
+          docker pull ${CHAT_BACK_IMAGE}
+          docker pull ${CHAT_CELERY_IMAGE}
 
           docker compose -f docker/deploy-docker-compose.yml up -d --force-recreate