X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e09fb44b7bf2d5682b8cc03091c6db1c2ea35580..17379ed7eb6e143667e53097f5ada570f051efd1:/docker/sso/Dockerfile diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile index 2933788ac4..99e3f4e41d 100644 --- a/docker/sso/Dockerfile +++ b/docker/sso/Dockerfile @@ -1,10 +1,10 @@ # Arvados API server Docker container. FROM arvados/passenger -MAINTAINER Ward Vandewege +MAINTAINER Ward Vandewege -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 @@ -13,14 +13,13 @@ 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 && \ + 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 tmp_omniauth log config.ru -R && \ chown www-data:www-data db db/production.sqlite3 && \ /bin/mkdir /var/run/apache2