7253: consume all blocks from BlockIterWithDuplicates, not just the first in test.

[arvados.git] / docker / base / Dockerfile

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index eac212c908a9ca8fc964a89b2624fded7bb84d8d..5eeabc8835af13db94c3e9f59e29ff94a2367aae 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -12,11 +12,17 @@ ENV DEBIAN_FRONTEND noninteractive
 
 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 -qq
-
-RUN apt-get install -qqy apt-utils git curl \
+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
+             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 && \
     /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -31,7 +37,7 @@ ADD generated/arvados.tar.gz /usr/src/arvados/
 # Update gem. This (hopefully) fixes
 # https://github.com/rubygems/rubygems.org/issues/613.
 RUN /usr/local/rvm/bin/rvm-exec default gem update --system && \
-    /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+    /usr/local/rvm/bin/rvm-exec default gem install bundler  -v 1.9.9 && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/services/api/Gemfile && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/doc/Gemfile