From 0d7f1847d738ff2144c9cc900c947892afb4a6c3 Mon Sep 17 00:00:00 2001
From: danilapog <danil.titarenko@onlyoffice.com>
Date: Fri, 10 Jun 2022 11:46:22 +0300
Subject: [PATCH] Edit workflow tags

---
 .github/workflows/build-stable.yml | 18 +++++++++---------
 docker-bake.hcl                    |  9 ++++++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-stable.yml b/.github/workflows/build-stable.yml
index 59ed63d..f1bbe5e 100644
--- a/.github/workflows/build-stable.yml
+++ b/.github/workflows/build-stable.yml
@@ -41,23 +41,23 @@ jobs:
 
       - name: Build documentserver-stable
         run: |
-          DOCKER_TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//')
-          SH_TAG1=$(echo ${DOCKER_TAG} | grep -o -P '^[\d]+\.[\d]+\.[\d]+')
-          SH_TAG2=$(echo ${DOCKER_TAG} | grep -o -P '^[\d]+\.[\d]+')
-          IMAGE_STATUS=$(docker manifest inspect ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$DOCKER_TAG > /dev/null ; echo $?)
+          TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//')
+          SHORTER_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+\.[\d]+')
+          SHORTEST_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+')
+          IMAGE_STATUS=$(docker manifest inspect ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$TAG > /dev/null ; echo $?)
              if [[ "$IMAGE_STATUS" = "0" ]]; then
                 echo "Image present on docker.hub >> start build stable version"
-                echo "FROM ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$DOCKER_TAG as ${{ env.PRODUCT_NAME }}-stable" >> Dockerfile.stable
+                echo "FROM ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$TAG as ${{ env.PRODUCT_NAME }}-stable" >> Dockerfile.stable
                 PRODUCT_EDITION=${{ matrix.edition }} PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
                 COMPANY_NAME=${{ env.COMPANY_NAME}} DOCKERFILE=Dockerfile.stable \
-                   TAG=$DOCKER_TAG \ #x.x.x.x tag
-                   SH1_TAG=$SH_TAG1 \ #x.x.x tag
-                   SH2_TAG=$SH_TAG2 \  #x.x tag
+                   TAG=$TAG \
+                   SHORTER_TAG=$SHORTER_TAG \
+                   SHORTEST_TAG=$SHORTEST_TAG \
                    docker buildx bake \
                    -f docker-bake.hcl ${{ matrix.images }} \
                    --push ;
              else
-                echo "FAILED: Image with tag $DOCKER_TAG do not presented on docker.hub >> build will not started >> exit with 0"
+                echo "FAILED: Image with tag $TAG do not presented on docker.hub >> build will not started >> exit with 0"
                 exit 0
              fi
         shell: bash
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7e25413..04ed4a0 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,11 +2,11 @@ variable "TAG" {
     default = ""
 }
 
-variable "SH1_TAG" {
+variable "SHORTER_TAG" {
     default = ""
 }
 
-variable "SH2_TAG" {
+variable "SHORTEST_TAG" {
     default = ""
 }
 
@@ -45,7 +45,10 @@ target "documentserver" {
 target "documentserver-stable" {
     target = "documentserver-stable"
     dockerfile= "${DOCKERFILE}"
-    tags = ["docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}", "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SH1_TAG}", "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SH2_TAG}", "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest"]
+    tags = ["docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}",
+            "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}",
+            "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTEST_TAG}",
+            "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest"]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
         "PRODUCT_EDITION": "${PRODUCT_EDITION}"