X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/38d27e9783f7f760cee84cc225e86144069848c4..cfa88a0915d5a49a6eb870505c346db2dbd58648:/docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 729d62c4cc..f529b796d1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,11 +11,27 @@ 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
-RUN gem install --no-ri --no-rdoc fpm
-RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
+
+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
+
+# 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