-RUN apt-get update && \
- apt-get -q -y install -q -y openssh-server apt-utils git curl \
- libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
- postgresql-server-dev-9.1 && \
- /bin/mkdir -p /root/.ssh && \
+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 -q
+
+## 2015-06-29 nico
+## KNOWN BUG: python-oauth2client needs specific versions
+## python-pyasn1=0.1.7 python-pyasn1-modules=0.0.5
+## but apt-get doesn't resolv them correctly. we have to
+## do it by hand here (or add apt_preferences if it gets too hairy)
+RUN apt-get install -qy apt-utils git curl \
+ libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
+ postgresql-server-dev-9.1 python-arvados-python-client \
+ python-google-api-python-client python-oauth2client python-pyasn1=0.1.7 python-pyasn1-modules=0.0.5
+
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \