From 7c0bfc4df5218d306114aa089e2d588c5e6928da Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 29 Oct 2021 16:46:20 -0400 Subject: [PATCH] Update version of Go used in the docker image. Add a "make packages-in-docker" target. no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- Makefile | 11 +++++++++++ docker/Dockerfile | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aaf2271c..26361bb1 100644 --- a/Makefile +++ b/Makefile @@ -130,5 +130,16 @@ copy: $(DEB_FILE) $(RPM_FILE) # use FPM to create DEB and RPM packages: copy +packages-in-docker: workbench2-build-image + docker run --env ci="true" \ + --env ARVADOS_DIRECTORY=/tmp/arvados \ + --env APP_NAME=${APP_NAME} \ + --env ITERATION=${ITERATION} \ + --env TARGETS="${TARGETS}" \ + -w="/tmp/workbench2" \ + -t -v ${WORKSPACE}:/tmp/workbench2 \ + -v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \ + make packages + workbench2-build-image: (cd docker && docker build -t workbench2-build .) diff --git a/docker/Dockerfile b/docker/Dockerfile index 729d62c4..3bffcac4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,16 @@ RUN apt-get update && \ libsecret-1-0 libsecret-1-dev rpm ruby ruby-dev rubygems build-essential \ libpam0g-dev libgbm1 git && \ apt-get clean -RUN apt-get -yq --no-install-recommends -t buster-backports install golang-go && \ - apt-get clean + +# 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 + RUN gem install --no-ri --no-rdoc fpm RUN git clone https://git.arvados.org/arvados.git && cd arvados && \ go mod download && \ -- 2.30.2