From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Tue, 12 Apr 2022 19:29:17 +0000 (-0300)
Subject: Merge branch '18881-process-runtime-status'. Closes #18881
X-Git-Tag: 2.4.1~5
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/08ac60f877d6495a748747a3a0d30ca9f0e289d5?hp=03578e716a63e7c5e0ce75cb70d0aaa803c02a77

Merge branch '18881-process-runtime-status'. Closes #18881

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6c3935c3..b93ebd50 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,8 +12,8 @@ RUN apt-get update && \
     libpam0g-dev libgbm1 git && \
     apt-get clean
 
-RUN gem install --no-ri --no-rdoc fpm
-RUN cd /usr/src && git clone https://git.arvados.org/arvados.git && \
+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 && \
@@ -25,6 +25,7 @@ RUN cd /usr/src && git clone https://git.arvados.org/arvados.git && \
     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 && \