[ARVADOS] updated: 5f6af45e3f79b2dbff55e821465f3d599a9e44e6

[git at public.curoverse.com]

Summary of changes:
 docker/build_tools/Makefile             | 89 ++++++++-------------------------
 docker/build_tools/list_generated_files | 14 ++++++
 docker/keep/Dockerfile                  |  2 +
 3 files changed, 38 insertions(+), 67 deletions(-)
 create mode 100755 docker/build_tools/list_generated_files

       via  5f6af45e3f79b2dbff55e821465f3d599a9e44e6 (commit)
      from  74d53a1ab38162c4c0977f12568617f7beb57c45 (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 5f6af45e3f79b2dbff55e821465f3d599a9e44e6
Author: Tim Pierce <twp at curoverse.com>
Date:   Thu Jul 31 14:46:13 2014 -0400

    3261: fixes for Docker build process
    
    * New tool list_generated_files avoids difficult quoting/escaping
      problems in Makefile
    
    * keep/Dockerfile fixes permissions on /usr/local/bin/run-keep
    
    Refs #3261.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 994749b..c30dbd3 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -52,6 +52,8 @@ deepclean: clean
 
 CONFIG_RB = build_tools/config.rb
 
+LIST_GENERATED_FILES = build_tools/list_generated_files
+
 BUILD = build/.buildstamp
 
 BASE_DEPS = base/Dockerfile $(BASE_GENERATED)
@@ -81,73 +83,26 @@ BCBIO_NEXTGEN_DEPS = bcbio-nextgen/Dockerfile
 
 BASE_GENERATED = base/generated/arvados.tar.gz
 
-SLURM_GENERATED = slurm/generated/*
-
-COMPUTE_GENERATED = compute/generated/setup.sh
-
-COMPUTE_GENERATED_IN = compute/setup.sh.in
-
-KEEP_GENERATED_IN := $(shell ls keep/*.in)
-
-KEEP_GENERATED := $(shell ls -1 $(KEEP_GENERATED_IN) | perl -pe 's:^keep:keep/generated:; s:\.in$::')
-
-API_GENERATED = \
-        api/generated/arvados-clients.yml \
-        api/generated/apache2_vhost \
-        api/generated/config_databases.sh \
-        api/generated/database.yml \
-        api/generated/omniauth.rb \
-        api/generated/application.yml \
-        api/generated/setup.sh \
-        api/generated/setup-gitolite.sh \
-        api/generated/slurm.conf \
-        api/generated/superuser_token
-
-API_GENERATED_IN = \
-        api/arvados-clients.yml.in \
-        api/apache2_vhost.in \
-        api/config_databases.sh.in \
-        api/database.yml.in \
-        api/omniauth.rb.in \
-        api/application.yml.in \
-        api/setup.sh.in \
-        api/setup-gitolite.sh.in \
-        api/slurm.conf.in \
-        api/superuser_token.in
-
-SHELL_GENERATED = \
-        shell/generated/setup.sh \
-        shell/generated/superuser_token
-
-SHELL_GENERATED_IN = \
-        shell/setup.sh.in \
-        shell/superuser_token.in
-
-SLURM_GENERATED = \
-        slurm/generated/slurm.conf
-
-SLURM_GENERATED_IN = \
-        slurm/slurm.conf.in
-
-WORKBENCH_GENERATED = \
-        workbench/generated/workbench_rails_env \
-        workbench/generated/apache2_vhost \
-        workbench/generated/application.yml
-
-WORKBENCH_GENERATED_IN = \
-        workbench/workbench_rails_env.in \
-        workbench/apache2_vhost.in \
-        workbench/application.yml.in
-
-SSO_GENERATED = \
-        sso/generated/apache2_vhost \
-        sso/generated/seeds.rb \
-        sso/generated/secret_token.rb
-
-SSO_GENERATED_IN = \
-        sso/apache2_vhost.in \
-        sso/seeds.rb.in \
-        sso/secret_token.rb.in
+COMPUTE_GENERATED_IN   = $(shell ls compute/*.in)
+COMPUTE_GENERATED      = $(shell $(LIST_GENERATED_FILES) $(COMPUTE_GENERATED_IN))
+
+KEEP_GENERATED_IN      = $(shell ls keep/*.in)
+KEEP_GENERATED         = $(shell $(LIST_GENERATED_FILES) $(KEEP_GENERATED_IN))
+
+API_GENERATED_IN       = $(shell ls api/*.in)
+API_GENERATED          = $(shell $(LIST_GENERATED_FILES) $(API_GENERATED_IN))
+
+SHELL_GENERATED_IN     = $(shell ls shell/*.in)
+SHELL_GENERATED        = $(shell $(LIST_GENERATED_FILES) $(SHELL_GENERATED_IN))
+
+SLURM_GENERATED_IN     = $(shell ls slurm/*.in)
+SLURM_GENERATED        = $(shell $(LIST_GENERATED_FILES) $(SLURM_GENERATED_IN))
+
+WORKBENCH_GENERATED_IN = $(shell ls workbench/*.in)
+WORKBENCH_GENERATED    = $(shell $(LIST_GENERATED_FILES) $(WORKBENCH_GENERATED_IN))
+
+SSO_GENERATED_IN       = $(shell ls sso/*.in)
+SSO_GENERATED          = $(shell $(LIST_GENERATED_FILES) $(SSO_GENERATED_IN))
 
 $(BUILD):
 	mkdir -p build
diff --git a/docker/build_tools/list_generated_files b/docker/build_tools/list_generated_files
new file mode 100755
index 0000000..170ee53
--- /dev/null
+++ b/docker/build_tools/list_generated_files
@@ -0,0 +1,14 @@
+#! /usr/bin/env ruby
+
+# list_generated_files file1 file2...
+#
+# Prints a list of the "generated" files that correspond to the files
+# listed on the command line.
+#
+# e.g.:
+# list_generated_files keep/config.rb.in api/application.yml.in
+# -> keep/generated/config.rb api/generated/application.yml
+
+print ARGV.collect { |f|
+  File.join(File.dirname(f), "generated", File.basename(f, ".in"))
+}.join(" "), "\n"
diff --git a/docker/keep/Dockerfile b/docker/keep/Dockerfile
index e342c8d..fd93247 100644
--- a/docker/keep/Dockerfile
+++ b/docker/keep/Dockerfile
@@ -13,5 +13,7 @@ RUN /usr/bin/apt-get install keep
 ADD generated/run-keep /usr/local/bin/
 ADD generated/keep_signing_secret /etc/
 
+RUN /bin/chmod a+x /usr/local/bin/run-keep
+
 # Start keep
 CMD ["/usr/local/bin/run-keep"]

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


hooks/post-receive
--