X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5638a684345d6fffd9a65cc01be61881c55ba2d2..ea7da293b0a10baef18cfc6e107c87a9c3b09546:/docker/sso/Dockerfile?ds=sidebyside

diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index f5dc2afc89..7d99ac6e73 100644
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -1,26 +1,29 @@
 # Arvados API server Docker container.
 
 FROM arvados/passenger
-MAINTAINER Ward Vandewege <ward@clinicalfuture.com>
+MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider ;\
-    bundle install --gemfile=/usr/src/sso-provider/Gemfile
+RUN git clone git://github.com/curoverse/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
+    /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 ; \
-    chown www-data:www-data db db/production.sqlite3 ; \
+RUN a2dissite default && \
+    a2ensite sso-provider && \
+    a2enmod rewrite && \
+    a2enmod ssl && \
+    cd /usr/src/sso-provider && \
+    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
 
 ADD apache2_foreground.sh /etc/apache2/foreground.sh