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 <peter.amstutz@curii.com>

diff --git a/Makefile b/Makefile
index aaf2271c60fab7f10f30765f23cd5fcbae4c2437..26361bb182d37486592582f5265a3726888e5bf3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -130,5 +130,16 @@ copy: $(DEB_FILE) $(RPM_FILE)
 # use FPM to create DEB and RPM
 packages: copy
 
 # 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 .)
 workbench2-build-image:
        (cd docker && docker build -t workbench2-build .)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 729d62c4cc2efaaa838513dc1603a98c45337a4e..3bffcac4a8a4d910c1b2b10a68f9239d931fadf7 100644 (file)
--- 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
     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 && \
 RUN gem install --no-ri --no-rdoc fpm
 RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
     go mod download && \