[ARVADOS] updated: 74d53a1ab38162c4c0977f12568617f7beb57c45

[git at public.curoverse.com]

Summary of changes:
 docker/build_tools/Makefile             |  4 +++-
 docker/keep/run-keep.in                 |  2 +-
 docker/workbench/Dockerfile             | 14 ++++++++------
 docker/workbench/workbench_rails_env.in |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 docker/workbench/workbench_rails_env.in

  discards  b6a2243a16c7137c16bd9d1697b0b46f83990ee5 (commit)
       via  74d53a1ab38162c4c0977f12568617f7beb57c45 (commit)
       via  33d7f4bcbf5c77da3a58f22d866e886ff8aa04dd (commit)
       via  f435a88f167ff6827bb520d4deeadb76f1cec53f (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 (b6a2243a16c7137c16bd9d1697b0b46f83990ee5)
            \
             N -- N -- N (74d53a1ab38162c4c0977f12568617f7beb57c45)

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 74d53a1ab38162c4c0977f12568617f7beb57c45
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 11:30:42 2014 -0400

    3261: Strip .in from list of generated files.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 1be6590..994749b 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -89,7 +89,7 @@ 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:')
+KEEP_GENERATED := $(shell ls -1 $(KEEP_GENERATED_IN) | perl -pe 's:^keep:keep/generated:; s:\.in$::')
 
 API_GENERATED = \
         api/generated/arvados-clients.yml \

commit 33d7f4bcbf5c77da3a58f22d866e886ff8aa04dd
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 11:30:01 2014 -0400

    3261: Fix wrong test: wanted file size == 0, not string length == 0.

diff --git a/docker/keep/run-keep.in b/docker/keep/run-keep.in
index 41360d7..aebdd38 100755
--- a/docker/keep/run-keep.in
+++ b/docker/keep/run-keep.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 pkf="/etc/keep_signing_secret"
-if [ -z "$pkf" ]
+if [ -s "$pkf" ]
 then
     permisson_key_arg=""
 else

commit f435a88f167ff6827bb520d4deeadb76f1cec53f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 10:46:14 2014 -0400

    3261: Propagate configured RAILS_ENV to Workbench build tasks.
    
    Without this, the rake assets:precompile task defaults to development
    mode and does nothing.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 8b5cd9e..1be6590 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -130,10 +130,12 @@ 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
 
diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index 97ed013..689f656 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -9,13 +9,15 @@ RUN apt-get update && apt-get -qqy install graphviz
 # Update Arvados source
 RUN /bin/mkdir -p /usr/src/arvados/apps
 ADD generated/workbench.tar.gz /usr/src/arvados/apps/
-RUN /bin/cp /usr/src/arvados/apps/workbench/config/environments/production.rb.example /usr/src/arvados/apps/workbench/config/environments/production.rb
+ADD generated/workbench_rails_env /etc/
+RUN /bin/cp /usr/src/arvados/apps/workbench/config/environments/$(cat /etc/workbench_rails_env).rb.example /usr/src/arvados/apps/workbench/config/environments/$(cat /etc/workbench_rails_env).rb
 ADD generated/application.yml /usr/src/arvados/apps/workbench/config/application.yml
 
-RUN /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
-    touch /usr/src/arvados/apps/workbench/log/production.log && \
-    chmod 666 /usr/src/arvados/apps/workbench/log/production.log && \
-    touch /usr/src/arvados/apps/workbench/db/production.sqlite3 && \
+RUN RAILS_ENV=$(cat /etc/workbench_rails_env) && \
+    /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
+    touch /usr/src/arvados/apps/workbench/log/$RAILS_ENV.log && \
+    chmod 666 /usr/src/arvados/apps/workbench/log/$RAILS_ENV.log && \
+    touch /usr/src/arvados/apps/workbench/db/$RAILS_ENV.sqlite3 && \
     cd /usr/src/arvados/apps/workbench && \
     /usr/local/rvm/bin/rvm-exec default bundle exec rake assets:precompile && \
     chown -R www-data:www-data /usr/src/arvados/apps/workbench
diff --git a/docker/workbench/workbench_rails_env.in b/docker/workbench/workbench_rails_env.in
new file mode 100644
index 0000000..f4f7638
--- /dev/null
+++ b/docker/workbench/workbench_rails_env.in
@@ -0,0 +1 @@
+@@WORKBENCH_RAILS_MODE@@
\ No newline at end of file

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


hooks/post-receive
--