Clone git repository properly in API server container. (refs #2221)

[arvados.git] / docker / api / Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index d2abcad151d484b072a84e80be0d0ec38f7aa77b..e1bb978a4d57cddb81e1cf224ace5b532a2baee8 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,19 +1,21 @@
 # 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
+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 --bare 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 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
@@ -24,12 +26,19 @@ ADD generated/apache2_vhost /etc/apache2/sites-available/arvados
 # Configure Rails databases.
 ENV RAILS_ENV production
 ADD generated/config_databases.sh /tmp/config_databases.sh
-RUN 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
+    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 && \
+    mkdir tmp && \
+    chown www-data:www-data tmp -R
 
 # Configure Apache and Passenger.
 ADD passenger.conf /etc/apache2/conf.d/passenger
@@ -37,8 +46,7 @@ RUN a2dissite default && \
     a2ensite arvados && \
     a2enmod rewrite && \
     a2enmod ssl && \
-    /bin/mkdir /var/run/apache2 && \
-    passenger-install-apache2-module --auto
+    /bin/mkdir /var/run/apache2
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf