From 1e7f7f61afab95b3b5d0e82470f8741c1c7fe1d7 Mon Sep 17 00:00:00 2001
From: urec56 <mail@urec56.ru>
Date: Fri, 11 Apr 2025 17:37:53 +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 | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index acaf55d..2274aef 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -1,5 +1,9 @@
 on: [push]
 
+env:
+  CHAT_BACK_IMAGE:git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}
+  CHAT_CELERY_IMAGE:git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}
+
 jobs:
   build:
     runs-on: docker
@@ -62,7 +66,10 @@ jobs:
           context: .
           file: docker/Dockerfile_back
           push: true
-          tags: git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}
+          tags: ${{ env.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
+
 
       - name: Build and push celery
         uses: https://git.urec56.ru/urec/build-push-action@v6
@@ -70,16 +77,16 @@ jobs:
           context: .
           file: docker/Dockerfile_celery
           push: true
-          tags: git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}
-  
+          tags: ${{ env.CHAT_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
+
   
   deploy:
     runs-on: docker
     needs:
       - build
-    env:
-      CHAT_BACK_IMAGE:git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}
-      CHAT_CELERY_IMAGE:git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}
+    
     steps:
       - name: Checkout repo
         uses: https://git.urec56.ru/urec/checkout@v4
@@ -93,8 +100,8 @@ jobs:
 
       - name: Pull and run container
         run: |
-          docker pull CHAT_BACK_IMAGE
-          docker pull CHAT_CELERY_IMAGE
+          docker pull ${{ env.CHAT_BACK_IMAGE }}
+          docker pull ${{ env.CHAT_CELERY_IMAGE }}
 
           docker compose -f docker/deploy-docker-compose.yml up -d --force-recreate