From 6aa4f3f193fbd9f1950ae9c3ecd0d4678d578dd2 Mon Sep 17 00:00:00 2001
From: danilapog <danil.titarenko@onlyoffice.com>
Date: Thu, 9 Jun 2022 19:50:23 +0300
Subject: [PATCH] Add short tags for images

---
 .github/workflows/build-stable.yml |  9 +++++++--
 docker-bake.hcl                    | 10 +++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-stable.yml b/.github/workflows/build-stable.yml
index bb5b1d1..59ed63d 100644
--- a/.github/workflows/build-stable.yml
+++ b/.github/workflows/build-stable.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        edition: ["", "-ee", "-de"]
         images: ["documentserver-stable"]
+        edition: ["", "-ee", "-de"]
     steps:
       - name: Checkout code 
         uses: actions/checkout@v3
@@ -42,12 +42,17 @@ 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 $?)
              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
                 PRODUCT_EDITION=${{ matrix.edition }} PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
-                COMPANY_NAME=${{ env.COMPANY_NAME}} DOCKERFILE=Dockerfile.stable TAG=$DOCKER_TAG \
+                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
                    docker buildx bake \
                    -f docker-bake.hcl ${{ matrix.images }} \
                    --push ;
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9e89642..7e25413 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,6 +2,14 @@ variable "TAG" {
     default = ""
 }
 
+variable "SH1_TAG" {
+    default = ""
+}
+
+variable "SH2_TAG" {
+    default = ""
+}
+
 variable "COMPANY_NAME" {
     default = ""
 }
@@ -37,7 +45,7 @@ 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}:latest"]
+    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"]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
         "PRODUCT_EDITION": "${PRODUCT_EDITION}"