X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2944aa770a1fd1870bc15f46aee37177d32c3b9c..dbd32ecbca3f108953e3b0560fcabbc300d58e7c:/docker/api/Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 68c20ec755..0c23d66ee5 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,41 +1,42 @@
 # Arvados API server Docker container.
 
-FROM arvados/base
+FROM arvados/passenger
 MAINTAINER Tim Pierce <twp@clinicalfuture.com>
 
 # Install postgres and apache
 RUN apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 \
-    libcurl4-openssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev \
-    supervisor
+                          supervisor
 
-# Install gems needed for API server
-RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile
+RUN /bin/mkdir -p /usr/src/arvados/services
+ADD generated/api.tar.gz /usr/src/arvados/services/
 
 # Install generated config files
 ADD generated/database.yml /usr/src/arvados/services/api/config/database.yml
 ADD generated/secret_token.rb /usr/src/arvados/services/api/config/initializers/secret_token.rb
 ADD generated/omniauth.rb /usr/src/arvados/services/api/config/initializers/omniauth.rb
 ADD generated/production.rb /usr/src/arvados/services/api/config/environments/production.rb
+ADD generated/apache2_vhost /etc/apache2/sites-available/arvados
 
-# Configure databases and users.
-ADD generated/config_databases.sh /tmp/config_databases.sh
-RUN sh /tmp/config_databases.sh ; \
-    rm /tmp/config_databases.sh
-
-# Set up the Rails database. This has to be done in a script so that
-# postgres can run in the background while running rake db:setup.
+# Configure Rails databases.
 ENV RAILS_ENV production
-ADD config_rake.sh /tmp/config_rake.sh
-RUN sh /tmp/config_rake.sh ; \
-    rm /tmp/config_rake.sh
+ADD generated/config_databases.sh /tmp/config_databases.sh
+RUN sh /tmp/config_databases.sh && \
+    rm /tmp/config_databases.sh && \
+    /etc/init.d/postgresql start && \
+    cd /usr/src/arvados/services/api && \
+    rake db:setup && \
+    rake assets:precompile ; \
+    chown www-data:www-data config.ru ; \
+    chown www-data:www-data log -R ; \
+    chown www-data:www-data tmp -R
 
 # Configure Apache and Passenger.
-ADD apache2_vhost /etc/apache2/sites-available/arvados
 ADD passenger.conf /etc/apache2/conf.d/passenger
 RUN a2dissite default ; \
     a2ensite arvados ; \
     a2enmod rewrite ; \
-    passenger-install-apache2-module --auto
+    a2enmod ssl ; \
+    /bin/mkdir /var/run/apache2
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf