projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19969-advanced-search-project-field' into main. Closes #19969
[arvados-workbench2.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index 6c3935c359bea02dac0f3a903164d4519900bb42..f529b796d104f408ec99ed31b74a39eb2069685e 100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-12,8
+12,8
@@
RUN apt-get update && \
libpam0g-dev libgbm1 git && \
apt-get clean
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 && \
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
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 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