[ARVADOS] updated: 4feb925895f5af5ee9b88d47b72b286d26f65a69

[git at public.curoverse.com]

Summary of changes:
 docker/keep/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

  discards  80658e010d069d18f39f7c58740dc6b0b16cbaff (commit)
       via  4feb925895f5af5ee9b88d47b72b286d26f65a69 (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 (80658e010d069d18f39f7c58740dc6b0b16cbaff)
            \
             N -- N -- N (4feb925895f5af5ee9b88d47b72b286d26f65a69)

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 4feb925895f5af5ee9b88d47b72b286d26f65a69
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Aug 9 13:38:28 2014 -0400

    3551: Use keep{store,proxy} from the working dir to build keep containers
    instead of running "apt-get install keep".

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index eb611ea..27f9909 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -104,6 +104,13 @@ WORKBENCH_GENERATED    = workbench/generated/*
 SSO_GENERATED_IN       = sso/*.in
 SSO_GENERATED          = sso/generated/*
 
+KEEP_DEPS += keep/generated/bin/keepproxy
+KEEP_DEPS += keep/generated/bin/keepstore
+keep/generated/bin/%: $(wildcard build/services/%/*.go)
+	mkdir -p keep/generated/src/git.curoverse.com
+	ln -sfn ../../../../.. keep/generated/src/git.curoverse.com/arvados.git
+	GOPATH=$(shell pwd)/keep/generated go get $(@:keep/generated/bin/%=git.curoverse.com/arvados.git/services/%)
+
 $(BUILD):
 	mkdir -p build
 	rsync -rlp --exclude=docker/ --exclude='**/log/*' --exclude='**/tmp/*' \
diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index 77c721c..7f21940 100755
--- a/docker/build_tools/config.rb
+++ b/docker/build_tools/config.rb
@@ -49,7 +49,7 @@ Dir.glob(globdir + '/*.in') do |template_file|
   generated_dir = File.join(File.dirname(template_file), 'generated')
   Dir.mkdir(generated_dir) unless Dir.exists? generated_dir
   output_path = File.join(generated_dir, File.basename(template_file, '.in'))
-  File.open(output_path, "w") do |output|
+  File.open(output_path, "w", File.stat(template_file).mode) do |output|
     File.open(template_file) do |input|
       input.each_line do |line|
 
diff --git a/docker/keep/Dockerfile b/docker/keep/Dockerfile
index 240cb39..cd40a72 100644
--- a/docker/keep/Dockerfile
+++ b/docker/keep/Dockerfile
@@ -2,20 +2,11 @@
 FROM arvados/debian:wheezy
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-RUN echo 'deb http://apt.arvados.org/ wheezy main' > /etc/apt/sources.list.d/apt.arvados.org.list
-
-RUN /usr/bin/apt-key adv --keyserver pgp.mit.edu --recv 1078ECD7
-
-RUN /usr/bin/apt-get update
-
-RUN /usr/bin/apt-get install keep
-
+ADD generated/bin/keepstore /usr/local/bin/
+ADD generated/bin/keepproxy /usr/local/bin/
 ADD generated/run-keep /usr/local/bin/
-RUN chmod +x /usr/local/bin/run-keep
 
 ADD generated/keep_signing_secret /etc/
 
-RUN /bin/chmod a+x /usr/local/bin/run-keep
-
 # Start keep
 CMD ["/usr/local/bin/run-keep"]
diff --git a/docker/keep/run-keep.in b/docker/keep/run-keep.in
index 9525ed5..a0b4cb0 100755
--- a/docker/keep/run-keep.in
+++ b/docker/keep/run-keep.in
@@ -8,4 +8,4 @@ else
     permission_args=""
 fi
 
-exec keep $permission_args -listen=":25107" -volumes="/keep-data"
+exec keepstore $permission_args -listen=":25107" -volumes="/keep-data"

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


hooks/post-receive
--