From c439d5f59500aeead9c23351bdcbb19cb53472cb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 11 Apr 2022 12:59:06 +0300 Subject: [PATCH] Fixed compilation on Ubuntu. Updated go version for Ubuntu to 1.17 --- Dockerfiles/build-base/ubuntu/Dockerfile | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index ff01e3af8..2316e2e5d 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -41,12 +41,35 @@ RUN set -eux && \ pkg-config \ gettext \ git \ - golang-1.16 \ + gnupg \ + wget \ unixodbc-dev" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ ${INSTALL_PKGS} && \ + ARCH_SUFFIX="$(arch)"; \ + case "$ARCH_SUFFIX" in \ + x86_64) \ + url='https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz'; \ + sha256='f242a9db6a0ad1846de7b6d94d507915d14062660616a61ef7c808a76e4f1676'; \ + ;; \ + aarch64) \ + url='https://dl.google.com/go/go1.17.2.linux-arm64.tar.gz'; \ + sha256='a5a43c9cdabdb9f371d56951b14290eba8ce2f9b0db48fb5fc657943984fd4fc'; \ + ;; \ + *) 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 && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/*