From 751eec7ca706377130891d8eb036f337753df9de Mon Sep 17 00:00:00 2001
From: Alex Borisov <79996669747@ya.ru>
Date: Tue, 30 Jan 2024 18:27:45 +0300
Subject: [PATCH] Refactor build.yaml file

---
 .gitea/workflows/build.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index f508e08..ea60d82 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -14,9 +14,6 @@ jobs:
         uses: actions/checkout@v3
       - name: List files in the repository
         run: |
-          package_name=$(basename ${{ github.repository }})
-          branch_name=$(git rev-parse --abbrev-ref HEAD)
-          commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S')
           ls ${{ gitea.workspace }}                    
       - run: echo "🍏 This job's status is ${{ job.status }}."
       - name: Install Docker
@@ -29,9 +26,13 @@ jobs:
           docker info                    
       - name: Build Dockerfile
         run: |
-          docker build -t $package_name .        
+          docker build -t $(basename ${{ github.repository }}) .        
       - name: Upload Docker image to soaska.ru
         run: |
+          package_name=$(basename ${{ github.repository }})
+          branch_name=$(git rev-parse --abbrev-ref HEAD)
+          commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S')
+
           docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru
           docker tag $package_name soaska.ru/soaska/$package_name:$branch_name-$commit_date
           docker tag $package_name soaska.ru/soaska/$package_name:latest