Precompile Rails assets.

Make sure mod_ssl is enabled in Apache.

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 0c5aaae4faad2cdabc610a47c836bd6fe4315a49..cd5c17e61c1d57a56f2ddfa07a5de3480632c210 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -18,23 +18,21 @@ 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.
+# Configure Rails databases.
 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.
-ENV RAILS_ENV production
 ADD config_rake.sh /tmp/config_rake.sh
-RUN sh /tmp/config_rake.sh ; \
-    rm /tmp/config_rake.sh
+ENV RAILS_ENV production
+RUN sh /tmp/config_databases.sh ; \
+    sh /tmp/config_rake.sh ; \
+    rm /tmp/config_databases.sh /tmp/config_rake.sh
 
 # Configure Apache and Passenger.
 ADD passenger.conf /etc/apache2/conf.d/passenger
 RUN a2dissite default ; \
     a2ensite arvados ; \
     a2enmod rewrite ; \
+    a2enmod ssl ; \
+    /bin/mkdir /var/run/apache2 ; \
     passenger-install-apache2-module --auto
 
 # Supervisor.

diff --git a/docker/api/config_rake.sh b/docker/api/config_rake.sh
index 885b5354d1dc66c933c661cc2a985cd702106564..020b1e421dfc42f4d943beaa8ac4f7d006de0267 100755 (executable)
--- a/docker/api/config_rake.sh
+++ b/docker/api/config_rake.sh
@@ -2,3 +2,4 @@
 
 /etc/init.d/postgresql start
 rake -f /usr/src/arvados/services/api/Rakefile db:setup
+rake -f /usr/src/arvados/services/api/Rakefile assets:precompile

diff --git a/docker/api/supervisor.conf b/docker/api/supervisor.conf
index bd38c83edf4b1752db57164ec50a5d30126d7aec..a9eed1ed6d6ff01df52bb332ad8e81e52dd1d8ce 100644 (file)
--- a/docker/api/supervisor.conf
+++ b/docker/api/supervisor.conf
@@ -1,6 +1,3 @@
-[supervisord]
-nodaemon=true
-
 [program:postgres]
 user=postgres
 command=/usr/lib/postgresql/9.1/bin/postgres -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf