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 eb611eadeb12d2388f771bfc1a0b1cf5e84f1421..27f9909e48d4c7b783f8f89c7527cbd259658a66 100644 (file)
--- 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 77c721c61f9ea1cca45302e58bad9c33f9e465de..7f219400dbb857b66bf55a7b5841da8d5617c3ea 100755 (executable)
--- 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 240cb39fc5221f9a5020c48cc6c2a1b5ec653660..cd40a72f5b236d9972c710dd30c656a21eaa1607 100644 (file)
--- a/docker/keep/Dockerfile
+++ b/docker/keep/Dockerfile
@@ -2,20 +2,11 @@
 FROM arvados/debian:wheezy
 MAINTAINER Ward Vandewege <ward@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 9525ed5a4c04f68083aee479e3c810e75f3bb084..a0b4cb0d2cb57101f9b287c83fffb2b9e34a7a20 100755 (executable)
--- 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"