Refactoring stable build (#490)

* Refactoring stable build

* Build: setting up push 4enterprise images

* Cosmetic change

* Remove needless tag

* Rename dockerfile

* Small fix

* Rename dockerfile for nonexample

Co-authored-by: danilapog <danil.titarenko@onlyoffice.com>

.github/workflows/4testing-build.yml

@@ -5,7 +5,6 @@ on:
   push:
     tags:
       - "v*"
-      - "!v*-stable"
 
 env: 
   COMPANY_NAME: "onlyoffice"

.github/workflows/stable-build.yml

@@ -2,9 +2,12 @@
 name: Multi-arch build stable
 
 on:
-  push:
+  workflow_dispatch:
-    tags:
+    inputs:
-      - "v*-stable"
+      tag:
+        description: 'Tag for release (ex. 1.2.3.45)'
+        type: string
+        required: true
 
 env:
   COMPANY_NAME: "onlyoffice"
@@ -35,37 +38,28 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Get Tag Name
-        id: tag_name
-        run: |
-          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
       - name: Build documentserver-release
         run: |
-          TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//')
+          set -eux
-          SHORTER_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+\.[\d]+')
+          VERSION=${{ github.event.inputs.tag }}
-          SHORTEST_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+')
+          PRODUCT_EDITION=${{ matrix.edition }}
-          IMAGE_STATUS=$(docker manifest inspect ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$TAG > /dev/null ; echo $?)
+          TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION}
-             if [[ "$IMAGE_STATUS" = "0" ]]; then
+          if docker manifest inspect ${TESTING_IMAGE}:${VERSION} > /dev/null; then
             echo "Image present on docker.hub >> start build stable version"
-                PRODUCT_EDITION=${{ matrix.edition }} \
+            export PRODUCT_EDITION
-                PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
+            export TAG=${VERSION}
-                COMPANY_NAME=${{ env.COMPANY_NAME}} \
+            export SHORTER_TAG=${VERSION%.*}
-                   TAG=$TAG \
+            export SHORTEST_TAG=${VERSION%.*.*}
-                   SHORTER_TAG=$SHORTER_TAG \
+            docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
-                   SHORTEST_TAG=$SHORTEST_TAG \
-                   docker buildx bake \
-                   -f docker-bake.hcl ${{ matrix.images }} \
-                   --push 
             echo "DONE: Build success >> exit with 0"
             exit 0
           else
-                echo "FAILED: Image with tag $TAG do not presented on docker.hub >> build will not started >> exit with 1"
+            echo "FAILED: Image with tag ${VERSION} do not presented on docker.hub >> build will not started >> exit with 1"
             exit 1
           fi
         shell: bash
 
-  build-nonExample:
+  build-nonexample:
     name: "Release image: DocumentServer${{ matrix.edition }}-nonExample"
     runs-on: ubuntu-latest
     needs: [build]
@@ -91,19 +85,10 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Get Tag Name
-        id: tag_name
-        run: |
-          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
       - name: build image
         run: |
-           TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//')
+          set -eux
-           PRODUCT_EDITION=${{ matrix.edition }} \
+          export PRODUCT_EDITION=${{ matrix.edition }}
-           PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
+          export TAG=${{ github.event.inputs.tag }}
-           COMPANY_NAME=${{ env.COMPANY_NAME }} \
+          docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
-           TAG=$TAG \
-           docker buildx bake \
-           -f docker-bake.hcl ${{ matrix.images }} \
-           --push
         shell: bash

docker-bake.hcl

@@ -44,7 +44,7 @@ variable "DEVELOP_BUILD" {
 
 target "documentserver" {
     target = "documentserver"
-    dockerfile= "${DOCKERFILE}"
+    dockerfile = "${DOCKERFILE}"
     tags = [
            "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}",
            notequal("",DEVELOP_BUILD) ? "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest": "",
@@ -61,11 +61,12 @@ target "documentserver" {
 
 target "documentserver-stable" {
     target = "documentserver-stable"
-    dockerfile= "Dockerfile.production"
+    dockerfile = "production.dockerfile"
     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"]
+            "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest",
+            equal("-ee",PRODUCT_EDITION) ? "docker.io/${COMPANY_NAME}4enterprise/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}": "",]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
         "TAG": "${TAG}"
@@ -77,7 +78,7 @@ target "documentserver-stable" {
 
 target "documentserver-nonexample" {
     target = "documentserver-nonexample"
-    dockerfile = "Dockerfile.production"
+    dockerfile = "production.dockerfile"
     tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {