From ebb5bf6fc93912af4013cb74b751e877c292eee7 Mon Sep 17 00:00:00 2001
From: Ward Vandewege <ward@curii.com>
Date: Wed, 16 Mar 2022 14:17:32 -0400
Subject: [PATCH] 18848: update the Dockerfile for package building to
 automatically pick        up the correct Go version.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---
 docker/Dockerfile | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3bffcac4..6c3935c3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,17 +12,21 @@ RUN apt-get update && \
     libpam0g-dev libgbm1 git && \
     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 && \
+RUN cd /usr/src && git clone https://git.arvados.org/arvados.git && \
+    cd arvados && \
+    GO_VERSION=$(grep 'goversion =' lib/install/deps.go |awk -F'"' '{print $2}') && \
+    echo $GO_VERSION && \
+    cd /usr/src && \
+    wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
+    tar xzf go${GO_VERSION}.linux-amd64.tar.gz && \
+    ln -s /usr/src/go/bin/go /usr/local/bin/go-${GO_VERSION} && \
+    ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-${GO_VERSION} && \
+    ln -s /usr/local/bin/go-${GO_VERSION} /usr/local/bin/go && \
+    ln -s /usr/local/bin/gofmt-${GO_VERSION} /usr/local/bin/gofmt
+
+RUN cd /usr/src/arvados && \
+    apt-get update && \
     go mod download && \
     go run ./cmd/arvados-server install -type test && cd .. && \
     rm -rf arvados && \
-- 
2.30.2