Accept data from a generator in arvados.CollectionWriter.write()

[arvados.git] / docker / api / Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index d2abcad151d484b072a84e80be0d0ec38f7aa77b..0c23d66ee595fb004641036321edf8843ab171e5 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,19 +1,15 @@
 # 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
 
 RUN /bin/mkdir -p /usr/src/arvados/services
 ADD generated/api.tar.gz /usr/src/arvados/services/
 
-# Install gems needed for API server
-RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile
-
 # 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
@@ -29,16 +25,18 @@ RUN sh /tmp/config_databases.sh && \
     /etc/init.d/postgresql start && \
     cd /usr/src/arvados/services/api && \
     rake db:setup && \
-    rake assets:precompile
+    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 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
+RUN a2dissite default ; \
+    a2ensite arvados ; \
+    a2enmod rewrite ; \
+    a2enmod ssl ; \
+    /bin/mkdir /var/run/apache2
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf