From 239115bbbaa168fbf2965c85218cb073f76ef4ef Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 14 Sep 2021 04:55:24 +0200
Subject: [PATCH] Updated Go lang to 1.17.1 version

---
 .github/workflows/build_images.yml | 10 +++-------
 build-base/alpine/Dockerfile       |  2 +-
 build-base/ubuntu/Dockerfile       |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 7bdeddee1..bc4c49ad0 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -29,11 +29,6 @@ jobs:
       latest_branch: ${{ github.event.repository.default_branch }}
       docker_repository: "zabbix"
     steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
       - shell: bash
         id: os
         run: |
@@ -342,8 +337,9 @@ jobs:
           build-args: BUILD_BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}/zabbix-build-base@${{ steps.prepare_tags.outputs.base_tag }}
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-             echo "${{ steps.docker_build.outputs.digest }}" > ${{ matrix.build }}_${{ matrix.os }}
+        run: |
+            echo ${{ steps.docker_build.outputs.digest }}
+            echo "${{ steps.docker_build.outputs.digest }}" > ${{ matrix.build }}_${{ matrix.os }}
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/build-base/alpine/Dockerfile b/build-base/alpine/Dockerfile
index aeb8a8ff3..142a73e00 100644
--- a/build-base/alpine/Dockerfile
+++ b/build-base/alpine/Dockerfile
@@ -6,7 +6,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    PATH=/usr/local/go/bin:/usr/lib/jvm/default-jvm/bin:$PATH \
+    PATH=/usr/lib/jvm/default-jvm/bin:$PATH \
     JAVA_HOME=/usr/lib/jvm/default-jvm
 
 LABEL org.opencontainers.image.title="Zabbix build base" \
diff --git a/build-base/ubuntu/Dockerfile b/build-base/ubuntu/Dockerfile
index d8712ad0f..61d195b1f 100644
--- a/build-base/ubuntu/Dockerfile
+++ b/build-base/ubuntu/Dockerfile
@@ -45,4 +45,4 @@ RUN set -eux && \
             gettext \
             git \
             golang-1.16 \
-            unixodbc-dev
\ No newline at end of file
+            unixodbc-dev