Merge pull request #2 from wtsi-hgi/feature/arv-view

[arvados.git] / docker / sso / Dockerfile

diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index 7ed89294cc55c43d7c825516680d877b71122bac..7d99ac6e73c21dd06466ec764904ba443709605b 100644 (file)
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -4,24 +4,25 @@ FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 RUN git clone git://github.com/curoverse/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
-    bundle install --gemfile=/usr/src/sso-provider/Gemfile
+    /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/sso-provider/Gemfile
 
 # Install generated config files
-ADD generated/secret_token.rb /usr/src/sso-provider/config/initializers/secret_token.rb
 ADD generated/seeds.rb /usr/src/sso-provider/db/seeds.rb
+ADD generated/database.yml /usr/src/sso-provider/config/database.yml
+ADD generated/application.yml /usr/src/sso-provider/config/application.yml
 ADD generated/apache2_vhost /etc/apache2/sites-available/sso-provider
 ADD generated/apache2_vhost /etc/apache2/sites-available/sso-provider
 
 # Configure Apache and Passenger.
-ADD passenger.conf /etc/apache2/conf.d/passenger
 RUN a2dissite default && \
     a2ensite sso-provider && \
     a2enmod rewrite && \
     a2enmod ssl && \
     cd /usr/src/sso-provider && \
-    RAILS_ENV=production rake db:setup && \
-    rake assets:precompile && \
-    chown www-data:www-data tmp_omniauth log config.ru -R && \
+    cp config/environments/production.rb.example config/environments/production.rb && \
+    RAILS_ENV=production /usr/local/rvm/bin/rvm-exec default bundle exec rake db:setup && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec rake assets:precompile && \
+    chown www-data:www-data log config.ru -R && \
     chown www-data:www-data db db/production.sqlite3 && \
     /bin/mkdir /var/run/apache2