[ARVADOS] updated: 06750c636edc78256a11aec392be21d63a0cceeb

[git at public.curoverse.com]

Summary of changes:
 docker/api/secret_token.rb.in | 5 +++++
 docker/build_tools/Makefile   | 3 ++-
 docker/config.yml.example     | 4 ++++
 docker/jobs/Dockerfile        | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

       via  06750c636edc78256a11aec392be21d63a0cceeb (commit)
       via  7ea7c6bc160097c24e2403d6f98f45a4369b4c7d (commit)
      from  e20bd70e4deaf55e7f162307a10118c66e2faac5 (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 06750c636edc78256a11aec392be21d63a0cceeb
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Jun 4 10:30:16 2014 -0400

    2933: Add Keep signing key configuration to Docker.
    
    This is a little hypothetical until we Dockerize the new Keep server,
    but it's necessary to get the API server running.
    
    Refs #2933.

diff --git a/docker/api/secret_token.rb.in b/docker/api/secret_token.rb.in
index 201870b..3008480 100644
--- a/docker/api/secret_token.rb.in
+++ b/docker/api/secret_token.rb.in
@@ -5,3 +5,8 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Server::Application.config.secret_token = '@@API_SECRET@@'
+
+# The blob_signing_key is a string of alphanumeric characters used
+# to sign permission hints for Keep locators. It must be identical
+# to the permission key given to Keep.
+Server::Application.config.blob_signing_key = '@@KEEP_SIGNING_SECRET@@'
diff --git a/docker/config.yml.example b/docker/config.yml.example
index da06fee..515fcbe 100644
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -45,6 +45,10 @@ ARVADOS_PROD_PW:
 # will be chosen randomly at build time. This is the
 # recommended setting.
 
+# The signing key shared by Keep at the API server to verify
+# blob permission signatures.
+KEEP_SIGNING_SECRET:
+
 # The value for the Rails config.secret_token setting.
 API_SECRET:
 

commit 7ea7c6bc160097c24e2403d6f98f45a4369b4c7d
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Jun 4 10:29:05 2014 -0400

    2933: Update Docker to use new Python package build process.
    
    Refs #2933.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 69db746..298551f 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -89,7 +89,8 @@ $(BUILD):
 	rsync -rlp --exclude=docker/ --exclude='**/log/*' --exclude='**/tmp/*' \
 		--chmod=Da+rx,Fa+rX ../ build/
 	find build/ -name \*.gem -delete
-	cd build/sdk/python/ && ./build.sh
+	cd build/services/fuse/ && python setup.py build
+	cd build/sdk/python/ && python setup.py build
 	cd build/sdk/cli && gem build arvados-cli.gemspec
 	cd build/sdk/ruby && gem build arvados.gemspec
 	touch build/.buildstamp
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 28ef858..29c9d54 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -14,6 +14,8 @@ RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \
 # Install Arvados packages.
 RUN find /usr/src/arvados/sdk -name '*.gem' -print0 | \
       xargs -0rn 1 gem install && \
+    cd /usr/src/arvados/services/fuse && \
+    python setup.py install && \
     cd /usr/src/arvados/sdk/python && \
     python setup.py install
 

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


hooks/post-receive
--