diff --git a/build-base/ubuntu/Dockerfile b/build-base/ubuntu/Dockerfile index 12146c1da..d8712ad0f 100644 --- a/build-base/ubuntu/Dockerfile +++ b/build-base/ubuntu/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:$PATH + PATH=/usr/lib/go-1.16/bin:$PATH LABEL org.opencontainers.image.title="Zabbix build base" \ org.opencontainers.image.authors="Alexey Pustovalov " \ @@ -44,37 +44,5 @@ RUN set -eux && \ pkg-config \ gettext \ git \ - tar \ - wget \ - gnupg \ - unixodbc-dev && \ - ARCH_SUFFIX="$(dpkg --print-architecture)"; ARCH_SUFFIX="${ARCH_SUFFIX##*-}"; \ - case "$ARCH_SUFFIX" in \ - 'amd64') \ - url='https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz'; \ - sha256='dab7d9c34361dc21ec237d584590d72500652e7c909bf082758fb63064fca0ef'; \ - ;; \ - 'armhf') \ - url='https://dl.google.com/go/go1.17.1.linux-armv6l.tar.gz'; \ - sha256='ed3e4dbc9b80353f6482c441d65b51808290e94ff1d15d56da5f4a7be7353758'; \ - ;; \ - 'arm64') \ - url='https://dl.google.com/go/go1.17.1.linux-arm64.tar.gz'; \ - sha256='53b29236fa03ed862670a5e5e2ab2439a2dc288fe61544aa392062104ac0128c'; \ - ;; \ - 'ppc64el') \ - url='https://dl.google.com/go/go1.17.1.linux-ppc64le.tar.gz'; \ - sha256='df4fa945512c3b472cf3d2dcb2e4ae5b34819607bc63f3223f5bc0c17b637dd0'; \ - ;; \ - *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ - esac; \ - wget -O go.tgz.asc "$url.asc" && \ - wget -O go.tgz "$url" --progress=dot:giga && \ - echo "$sha256 *go.tgz" | sha256sum -c - && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \ - gpg --batch --verify go.tgz.asc go.tgz && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" go.tgz.asc && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz + golang-1.16 \ + unixodbc-dev \ No newline at end of file