X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/394ebdfd13fe40a7096f484c46a353d2537f4c9a..80fe37808eea2457526a9058d6b0890662c1097a:/docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3bffcac4a8..f529b796d1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,18 +12,26 @@ 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 /usr/bin/gem install --no-document fpm
+RUN cd /usr/src && git clone git://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 gem install --no-ri --no-rdoc fpm
-RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
+# preseed arvados build dependencies
+RUN cd /usr/src/arvados && \
+    apt-get update && \
     go mod download && \
     go run ./cmd/arvados-server install -type test && cd .. && \
     rm -rf arvados && \
     apt-get clean
+
+RUN git config --global --add safe.directory /usr/src/arvados && \
+    git config --global --add safe.directory /usr/src/workbench2
\ No newline at end of file