From b7fc9d2911bc11d784eb0c207179f3879f532b1e Mon Sep 17 00:00:00 2001
From: danilapog <danil.titarenko@onlyoffice.com>
Date: Thu, 21 Jul 2022 18:20:42 +0300
Subject: [PATCH] Set to use default TARGETARCH in build

---
 .github/workflows/4testing-build.yml | 21 ++++-----------------
 Dockerfile                           |  5 +----
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/4testing-build.yml b/.github/workflows/4testing-build.yml
index 29429f1..306b6e1 100644
--- a/.github/workflows/4testing-build.yml
+++ b/.github/workflows/4testing-build.yml
@@ -44,13 +44,13 @@ jobs:
 
       - name: Build 4testing
         run: |
-          ### ➡  At this step build variable declaration ###
+          ### ==>> At this step build variable declaration ###
           DOCKER_TAG=$( echo ${{ env.RELEASE_VERSION }} | sed 's/^.//' )
           PACKAGE_VERSION=$( echo $DOCKER_TAG | sed -E 's/(.*)\./\1-/' )
           NODE_PLATFORMS=$( echo ${{ steps.buildx.outputs.platforms }} | sed 's/linux\///g' | sed 's/,/ /g' )
           echo "Start check avalivable build platforms >>"
 
-          ### ➡  In this loop we will check all avalivable documentserver architectures. After that all accessed arch will be added to build-platforms list. ###
+          ### ==>> In this loop we will check all avalivable documentserver architectures. After that all accessed arch will be added to build-platforms list. ###
           for ARCH in ${NODE_PLATFORMS}; do
             REPO_URL=${{ secrets.REPO_URL }} 
             if [[ ${{ env.RELEASE_VERSION }} == v99.* ]]; then
@@ -68,28 +68,15 @@ jobs:
           done
           PACKAGE_URL_BUILD=$( echo ${PACKAGE_URL_CHECK} | sed -e "s/${PACKAGE_VERSION}_.*.deb/${PACKAGE_VERSION}_TARGETARCH.deb/g" )
 
-          ### ➡  At this step if there is no access to any platform and platform list is empty, build will exit with 1. ###  
+          ### ==>> At this step if there is no access to any platform and platform list is empty, build will exit with 1. ###  
           if [[ -z ${BUILD_PLATFORMS} ]]; then
             echo "Have no access to any platform >> exit with 1"
             exit 1
           fi
           echo "DONE: Check passed >> Build for platforms: ${BUILD_PLATFORMS}"
-
-          ### ➡  Preconfiguration for debugging with --print key ### 
-          PRODUCT_EDITION=${{ matrix.edition }} \
-          PACKAGE_URL=$PACKAGE_URL_BUILD \
-          PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
-          DOCKERFILE=Dockerfile \
-          PREFIX_NAME=4testing- \
-          TAG=$DOCKER_TAG \
-          PLATFORM=$BUILD_PLATFORMS \
-          COMPANY_NAME=${{ env.COMPANY_NAME }} \
-            docker buildx bake \
-            -f docker-bake.hcl ${{ matrix.images }} \
-            --print
           echo "Build is starting ... >>"
 
-          ### ➡  Build and push images at this step ### 
+          ### ==>> Build and push images at this step ### 
           PRODUCT_EDITION=${{ matrix.edition }} \
           PACKAGE_URL=$PACKAGE_URL_BUILD \
           PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
diff --git a/Dockerfile b/Dockerfile
index 422bfef..dc73ab6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,10 +81,7 @@ ENV COMPANY_NAME=$COMPANY_NAME \
     PRODUCT_NAME=$PRODUCT_NAME \
     PRODUCT_EDITION=$PRODUCT_EDITION
 
-RUN ARCH=$(uname -m)
-    if [ "${ARCH}" = "x86_64" ]; then ARCH=amd64; fi && \
-    if [ "${ARCH}" = "aarch64" ]; then ARCH=arm64; fi && \
-    PACKAGE_URL=$( echo ${PACKAGE_URL} | sed "s/TARGETARCH/"${ARCH}"/g") && \
+RUN PACKAGE_URL=$( echo ${PACKAGE_URL} | sed "s/TARGETARCH/"${TARGETARCH}"/g") && \
     wget -q -P /tmp "$PACKAGE_URL" && \
     apt-get -y update && \
     service postgresql start && \