Merge branch 'master' into 3836-remove-collection-from-project-bug

[arvados.git] / docker / base / Dockerfile

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index f1defceb7d2f2a1e85eaadb3ad7d81e25ec70263..b90b44ca4c56fbf8781fd054f804a017faf423d3 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -22,6 +22,10 @@ RUN apt-get update && \
     /usr/local/rvm/bin/rvm alias create default ruby && \
     /bin/mkdir -p /usr/src/arvados
 
+ADD apt.arvados.org.list /etc/apt/sources.list.d/
+RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+RUN apt-get update && apt-get -qqy install python-arvados-python-client
+
 ADD generated/arvados.tar.gz /usr/src/arvados/
 
 # Update gem. This (hopefully) fixes