[ARVADOS] updated: a2c6413372139de31827f9f2299ba004d8edd1b7

[git at public.curoverse.com]

Summary of changes:
 docker/compute/Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

       via  a2c6413372139de31827f9f2299ba004d8edd1b7 (commit)
      from  f78b6578bc950b72f0ffac516bde9c8fde2416be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a2c6413372139de31827f9f2299ba004d8edd1b7
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Oct 28 10:58:47 2014 -0400

    3824: Remove redundant addition of arvados package repo and key.

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 792fd28..fa6783b 100644
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -9,11 +9,8 @@ ADD fuse.conf /etc/fuse.conf
 
 RUN /usr/local/rvm/bin/rvm-exec default gem install arvados-cli arvados
 
-# Install Docker from the Arvados package repository
-RUN apt-get update -qq && apt-get install -qqy iptables ca-certificates lxc apt-transport-https
-ADD apt.arvados.org.list /etc/apt/sources.list.d/apt.arvados.org.list
-RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
-RUN apt-get update -qq && apt-get install -qqy docker.io
+# Install Docker from the Arvados package repository (cf. arvados/base)
+RUN apt-get update -qq && apt-get install -qqy 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
 

-----------------------------------------------------------------------


hooks/post-receive
--