we need to manually install python-pyasn1=0.1.7 python-pyasn1-modules=0.0.5 because...

apt-get install are less quiet now too.

no issue #

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 51d452b399e39603f262a318094fc1f0df69c02b..758c015aa344d7147a6cda0baf7b51ca46ecd956 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -4,8 +4,8 @@ FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # Install postgres and apache.
-RUN apt-get update -qq
-RUN apt-get install -qqy \
+RUN apt-get update -q
+RUN apt-get install -qy \
     procps postgresql postgresql-server-dev-9.1 slurm-llnl munge \
     supervisor sudo libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
     libjson-perl cron openssh-server

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 2347da355b0f7d816576c0fd116eb6c2d88baf91..e46cdd3e9c86fe953e34f4c0ab7a6d387bef110a 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -12,11 +12,18 @@ 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 && \

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 402ed64b0cf885826865a287089e356efe6b5049..f2f48da79453f8568442be224bded0210a91a677 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,8 +3,8 @@
 FROM arvados/slurm
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update -qq
-RUN apt-get install -qqy supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
+RUN apt-get update -q
+RUN apt-get install -qy supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
 
 ADD fuse.conf /etc/fuse.conf
 RUN chmod 644 /etc/fuse.conf
@@ -12,7 +12,7 @@ RUN chmod 644 /etc/fuse.conf
 RUN /usr/local/rvm/bin/rvm-exec default gem install arvados-cli arvados
 
 # Install Docker from the Arvados package repository (cf. arvados/base)
-RUN apt-get install -qqy iptables ca-certificates lxc apt-transport-https docker.io
+RUN apt-get install -qy iptables ca-certificates lxc apt-transport-https docker.io
 
 RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid 4005 crunch && usermod crunch -G fuse,docker && chown crunch:crunch /home/crunch
 

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index d890710c4641c349b58811d41d22595aed2d68d5..1492675275d1cb87ee2172cda186c0400c6493e4 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -5,8 +5,8 @@ maintainer Ward Vandewege <ward@curoverse.com>
 
 # Install packages
 RUN /bin/mkdir -p /usr/src/arvados && \
-    apt-get update -qq && \
-    apt-get install -qqy curl procps apache2-mpm-worker
+    apt-get update -q && \
+    apt-get install -qy curl procps apache2-mpm-worker
 
 ADD generated/doc.tar.gz /usr/src/arvados/
 

diff --git a/docker/java-bwa-samtools/Dockerfile b/docker/java-bwa-samtools/Dockerfile
index 713ef2116a6fe7a7936ce6abc34877f3fc3de348..2a73977c525aa74cb22d81ff320fd44f22031f69 100644 (file)
--- a/docker/java-bwa-samtools/Dockerfile
+++ b/docker/java-bwa-samtools/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Peter Amstutz <peter.amstutz@curoverse.com>
 
 USER root
 
-RUN apt-get update -qq
-RUN apt-get install -qqy openjdk-7-jre-headless && \
+RUN apt-get update -q
+RUN apt-get install -qy openjdk-7-jre-headless && \
     cd /tmp && \
     curl --location http://cache.arvados.org/sourceforge.net/project/bio-bwa/bwa-0.7.9a.tar.bz2 -o bwa-0.7.9a.tar.bz2 && \
     tar xjf bwa-0.7.9a.tar.bz2 && \

diff --git a/docker/keepproxy/Dockerfile b/docker/keepproxy/Dockerfile
index 78e82b9ab63274936c763a3b6b564f1f365e6baf..e8df16881670a2907621b7f1b29ef3d50d3c0af2 100644 (file)
--- a/docker/keepproxy/Dockerfile
+++ b/docker/keepproxy/Dockerfile
@@ -2,8 +2,8 @@
 FROM arvados/debian:wheezy
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update -qq
-RUN apt-get install -qqy ca-certificates
+RUN apt-get update -q
+RUN apt-get install -qy ca-certificates
 
 ADD generated/bin/keepproxy /usr/local/bin/
 ADD generated/run-keepproxy /usr/local/bin/

diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index 5e0fd76b04955b8fb94f23ed327a6ac4439872f1..77aeb6606b0a8339a225cda6bcbd1b4c3b3ceefd 100644 (file)
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -5,8 +5,8 @@ MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # Install packages and build the passenger apache module
 
-RUN apt-get update -qq
-RUN apt-get install -qqy \
+RUN apt-get update -q
+RUN apt-get install -qy \
         apt-utils git curl procps apache2-mpm-worker \
         libcurl4-openssl-dev apache2-threaded-dev \
         libapr1-dev libaprutil1-dev

diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
index 8a59acfbd0cd95e81d8e20fde30082e15bae59ae..a99a886e956eba25f5206c1e81c8bb8f410639ff 100644 (file)
--- a/docker/postgresql/Dockerfile
+++ b/docker/postgresql/Dockerfile
@@ -19,7 +19,7 @@ ENV ARVADOS_PROD_USER  arvados
 ENV ARVADOS_PROD_PW    dummy_pw
 
 # Install postgres and apache
-RUN apt-get -q -y install procps postgresql postgresql-server-dev-9.1
+RUN apt-get install -qy procps postgresql postgresql-server-dev-9.1
 
 # Configure databases and users.
 ADD postgresql.conf /etc/postgresql/9.1/main/

diff --git a/docker/shell/Dockerfile b/docker/shell/Dockerfile
index 8235159999934244e319db16c8b7e472f58c9390..8f0ed41afaefc9ae4aa86daf86097fbcdcad1712 100644 (file)
--- a/docker/shell/Dockerfile
+++ b/docker/shell/Dockerfile
@@ -3,8 +3,8 @@
 FROM arvados/base
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update -qq
-RUN apt-get install -qqy \
+RUN apt-get update -q
+RUN apt-get install -qy \
     python-pip python-pyvcf python-gflags python-google-api-python-client \
     python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse \
     crunchstat python-arvados-fuse cron vim supervisor openssh-server

diff --git a/docker/slurm/Dockerfile b/docker/slurm/Dockerfile
index 7e4284f67f3521254a593c13fe8e35feac3af709..28a3c3b24c6a47ea03aeb63b3f08aee92bddd483 100644 (file)
--- a/docker/slurm/Dockerfile
+++ b/docker/slurm/Dockerfile
@@ -3,8 +3,8 @@
 FROM arvados/base
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update -qq
-RUN apt-get install -qqy slurm-llnl munge
+RUN apt-get update -q
+RUN apt-get install -qy slurm-llnl munge
 
 ADD munge.key /etc/munge/
 RUN chown munge:munge /etc/munge/munge.key && chmod 600 /etc/munge/munge.key

diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index 2e2a782d7b3cf1db5ca011720a433fb8233d9f6e..148153add20adc8b27138b67cb2f73a65e94867d 100644 (file)
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -4,8 +4,8 @@ FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # We need graphviz for the provenance graphs
-RUN apt-get update -qq
-RUN apt-get install -qqy graphviz
+RUN apt-get update -q
+RUN apt-get install -qy graphviz
 
 # Update Arvados source
 RUN /bin/mkdir -p /usr/src/arvados/apps