4670: Node Manager handles more libcloud exceptions.

[arvados.git] / docker / workbench / Dockerfile

diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index df306b38451ad4fc24f40c973dacf92aca6d76be..94d9f87765aeaf88abe53e9ff1c93e61421214ef 100644 (file)
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -3,20 +3,24 @@
 FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
+# We need graphviz for the provenance graphs
+RUN apt-get update -qq
+RUN apt-get install -qqy 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
-ADD passenger.conf /etc/apache2/conf.d/passenger
-
 
-RUN 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 && \
-    rake assets:precompile && \
+    /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