[ARVADOS] updated: b6a2243a16c7137c16bd9d1697b0b46f83990ee5

[git at public.curoverse.com]

Summary of changes:
 docker/workbench/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

       via  b6a2243a16c7137c16bd9d1697b0b46f83990ee5 (commit)
      from  7305149050a24e7429ff679579cd4182188a7116 (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 b6a2243a16c7137c16bd9d1697b0b46f83990ee5
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/workbench/Dockerfile b/docker/workbench/Dockerfile
index 97ed013..69b5927 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -9,15 +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
+RUN /bin/cp /usr/src/arvados/apps/workbench/config/environments/@@WORKBENCH_RAILS_MODE@@.rb.example /usr/src/arvados/apps/workbench/config/environments/@@WORKBENCH_RAILS_MODE@@.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=@@WORKBENCH_RAILS_MODE@@ /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
+    touch /usr/src/arvados/apps/workbench/log/@@WORKBENCH_RAILS_MODE@@.log && \
+    chmod 666 /usr/src/arvados/apps/workbench/log/@@WORKBENCH_RAILS_MODE@@.log && \
+    touch /usr/src/arvados/apps/workbench/db/@@WORKBENCH_RAILS_MODE@@.sqlite3 && \
     cd /usr/src/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle exec rake assets:precompile && \
+    RAILS_ENV=@@WORKBENCH_RAILS_MODE@@ /usr/local/rvm/bin/rvm-exec default bundle exec rake assets:precompile && \
     chown -R www-data:www-data /usr/src/arvados/apps/workbench
 
 # Configure Apache

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


hooks/post-receive
--