From c8757ec7b90a55988224e45a523a6528c952eeb3 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Fri, 29 Oct 2021 09:29:29 -0400 Subject: [PATCH] We now rely on Go 1.16. Unbreak the arvbox build toolchain by switching to upstream Golang, the buster-backports version is too old. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- .../arvbox/lib/arvbox/docker/Dockerfile.base | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base index 4556652563..27757be649 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base @@ -16,17 +16,21 @@ ARG BUILDTYPE FROM debian:10-slim as dev ENV DEBIAN_FRONTEND noninteractive -RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list - RUN apt-get update && \ apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \ - golang -t buster-backports - -RUN apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \ - build-essential ca-certificates git libpam0g-dev + build-essential ca-certificates git libpam0g-dev wget ENV GOPATH /var/lib/gopath +# Get Go 1.16.9 +RUN cd /usr/src && \ + wget https://golang.org/dl/go1.16.9.linux-amd64.tar.gz && \ + tar xzf go1.16.9.linux-amd64.tar.gz && \ + ln -s /usr/src/go/bin/go /usr/local/bin/go-1.16.9 && \ + ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-1.16.9 && \ + ln -s /usr/local/bin/go-1.16.9 /usr/local/bin/go && \ + ln -s /usr/local/bin/gofmt-1.16.9 /usr/local/bin/gofmt + # the --mount option requires the experimental syntax enabled (enables # buildkit) on the first line of this file. This Dockerfile must also be built # with the DOCKER_BUILDKIT=1 environment variable set. @@ -40,17 +44,21 @@ RUN --mount=type=bind,target=/usr/src/arvados \ FROM debian:10-slim as demo ENV DEBIAN_FRONTEND noninteractive -RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list - RUN apt-get update && \ apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \ - golang -t buster-backports - -RUN apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \ - build-essential ca-certificates git libpam0g-dev + build-essential ca-certificates git libpam0g-dev wget ENV GOPATH /var/lib/gopath +# Get Go 1.16.9 +RUN cd /usr/src && \ + wget https://golang.org/dl/go1.16.9.linux-amd64.tar.gz && \ + tar xzf go1.16.9.linux-amd64.tar.gz && \ + ln -s /usr/src/go/bin/go /usr/local/bin/go-1.16.9 && \ + ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-1.16.9 && \ + ln -s /usr/local/bin/go-1.16.9 /usr/local/bin/go && \ + ln -s /usr/local/bin/gofmt-1.16.9 /usr/local/bin/gofmt + ARG arvados_version RUN echo arvados_version is git commit $arvados_version -- 2.30.2