Fix makefile brittleness.

[arvados.git] / docker / sso / Dockerfile

diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index 552428b24083740993117b97e33a79e5e2356c28..2933788ac49ca968904e1ff7e7144f12225ce152 100644 (file)
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -1,15 +1,10 @@
 # Arvados API server Docker container.
 
-FROM arvados/base
+FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@clinicalfuture.com>
 
-RUN apt-get update ;\
-    apt-get install -q -y apt-utils git curl procps apache2-mpm-worker locales \
-                          libcurl4-openssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev ;\
-    git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider ;\
-    bundle install --gemfile=/usr/src/sso-provider/Gemfile ;\
-    gem install passenger -v 4.0.24 ;\
-    passenger-install-apache2-module --auto
+RUN git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
+    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
@@ -19,12 +14,15 @@ 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 /usr/src/sso-provider/tmp_omniauth /usr/src/sso-provider/log -R ; \
+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 && \
     /bin/mkdir /var/run/apache2
 
 ADD apache2_foreground.sh /etc/apache2/foreground.sh