-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 && \