From 9a2b6b3c8e9f87ee4d68be57822818901a12e9f0 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 14 Sep 2021 07:21:16 +0200
Subject: [PATCH] Updated Go lang to 1.17.1 version

---
 .github/workflows/build_images.yml | 2 +-
 java-gateway/alpine/Dockerfile     | 1 -
 java-gateway/ol/Dockerfile         | 1 -
 java-gateway/ubuntu/Dockerfile     | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index bc4c49ad0..f2de79130 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -498,7 +498,7 @@ jobs:
           context: ./${{ matrix.build }}/${{ matrix.os }}
           file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile
           platforms: ${{ steps.platform.outputs.list }}
-          push: false
+          push: ${{ secrets.AUTO_PUSH_IMAGES }}
           tags: ${{ steps.prepare_tags.outputs.image_tag_versions }}
           build-args: BUILD_BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}/zabbix-${{ steps.build_base_image.outputs.build_base }}@${{ steps.prepare_tags.outputs.base_tag }}
 
diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile
index bca8b7beb..c785988ed 100644
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@@ -29,7 +29,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin", "/usr/sbin/zabbix_java/bin"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
-COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     addgroup --system --gid 1995 zabbix && \
diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile
index 462280050..467025a36 100644
--- a/java-gateway/ol/Dockerfile
+++ b/java-gateway/ol/Dockerfile
@@ -28,7 +28,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin", "/usr/sbin/zabbix_java/bin"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
-COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     groupadd --system --gid 1995 zabbix && \
diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile
index 358696103..cfd9a5ff9 100644
--- a/java-gateway/ubuntu/Dockerfile
+++ b/java-gateway/ubuntu/Dockerfile
@@ -28,7 +28,6 @@ STOPSIGNAL SIGTERM
 
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin", "/usr/sbin/zabbix_java/bin"]
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
-COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \