X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5e020488f67b5bc919796e0dc8b0b9f3b3ff23b0..7e05875bc2514dd4df0a1c566ebc634e8a2ae3b8:/docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c3935c3..f529b796 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,9 +25,13 @@ 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 && \ 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