[ARVADOS] updated: 81bb05b5a18c9501057876bf5b0e1923778dad26

[git at public.curoverse.com]

Summary of changes:
 docker/compute/apt.arvados.org.list | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docker/compute/apt.arvados.org.list

  discards  a2c6413372139de31827f9f2299ba004d8edd1b7 (commit)
       via  81bb05b5a18c9501057876bf5b0e1923778dad26 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a2c6413372139de31827f9f2299ba004d8edd1b7)
            \
             N -- N -- N (81bb05b5a18c9501057876bf5b0e1923778dad26)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 81bb05b5a18c9501057876bf5b0e1923778dad26
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Oct 28 10:59:40 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
 
diff --git a/docker/compute/apt.arvados.org.list b/docker/compute/apt.arvados.org.list
deleted file mode 100644
index ebf93f2..0000000
--- a/docker/compute/apt.arvados.org.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://apt.arvados.org/ wheezy main

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


hooks/post-receive
--