X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/189fee6586b290a78cdc1b3a3b9845efe0cf7499..5d3de212473f9fbf0e797c1fc03ec1dbf8f532ef:/docker/workbench/Dockerfile

diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index bd0bf4551e..148153add2 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -3,21 +3,24 @@
 FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
+# We need graphviz for the provenance graphs
+RUN apt-get update -q
+RUN apt-get install -qy graphviz
+
 # Update Arvados source
 RUN /bin/mkdir -p /usr/src/arvados/apps
 ADD generated/workbench.tar.gz /usr/src/arvados/apps/
-ADD generated/secret_token.rb /usr/src/arvados/apps/workbench/config/initializers/secret_token.rb
-ADD generated/production.rb /usr/src/arvados/apps/workbench/config/environments/production.rb
-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 && \
-    bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
+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 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
@@ -25,10 +28,10 @@ ADD generated/apache2_vhost /etc/apache2/sites-available/workbench
 RUN \
   a2dissite default && \
   a2ensite workbench && \
-  a2enmod rewrite
+  a2enmod rewrite && \
+  /bin/mkdir /var/run/apache2
 
 ADD apache2_foreground.sh /etc/apache2/foreground.sh
 
 # Start Apache
 CMD ["/etc/apache2/foreground.sh"]
-