Merge branch 'master' into 2221-complete-docker

[arvados.git] / docker / api / Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 0c5aaae4faad2cdabc610a47c836bd6fe4315a49..6f3b792f5852f6fbdf5ff37d6042cf7e982c8b17 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,15 +1,20 @@
 # Arvados API server Docker container.
 
-FROM arvados/base
-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
-
-# Install gems needed for API server
-RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile
+FROM arvados/passenger
+MAINTAINER Tim Pierce <twp@curoverse.com>
+
+# Install postgres and apache.
+# Clone a git repository of Arvados source -- not used to build, but
+# will be used by the Commit model and anything else that needs to
+# check a git repo for crunch scripts.
+#
+RUN apt-get update && \
+    apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 \
+                          supervisor && \
+    git clone git://github.com/curoverse/arvados.git /var/cache/git/arvados.git
+
+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
@@ -18,24 +23,29 @@ ADD generated/omniauth.rb /usr/src/arvados/services/api/config/initializers/omni
 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
+ADD generated/superuser_token /tmp/superuser_token
+RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile && \
+    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 && \
+    ./script/create_superuser_token.rb $(cat /tmp/superuser_token) && \
+    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 passenger.conf /etc/apache2/conf.d/passenger
-RUN a2dissite default ; \
-    a2ensite arvados ; \
-    a2enmod rewrite ; \
-    passenger-install-apache2-module --auto
+RUN a2dissite default && \
+    a2ensite arvados && \
+    a2enmod rewrite && \
+    a2enmod ssl && \
+    /bin/mkdir /var/run/apache2
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf