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 a0a6997d6e38da662a91cc7ba8d4fd4a3f7b4e12..e1bb978a4d57cddb81e1cf224ace5b532a2baee8 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,38 +1,56 @@
 # Arvados API server Docker container.
 
-FROM arvados/base
-MAINTAINER Tim Pierce <twp@clinicalfuture.com>
-
-# TODO(twp): parameterize variables via autoconf or similar.
-ENV POSTGRES_ROOT_PW   dummy_pw
-
-ENV ARVADOS_DEV_DB     arvados_development
-ENV ARVADOS_DEV_USER   arvados
-ENV ARVADOS_DEV_PW     dummy_pw
-
-ENV ARVADOS_TEST_DB    arvados_test
-ENV ARVADOS_TEST_USER  arvados
-ENV ARVADOS_TEST_PW    dummy_pw
-
-ENV ARVADOS_PROD_DB    arvados_production
-ENV ARVADOS_PROD_USER  arvados
-ENV ARVADOS_PROD_PW    dummy_pw
-
-# Install postgres and apache
-RUN apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2
-
-# Configure databases and users.
-ADD postgresql_config.sh /tmp/postgresql_config.sh
-RUN /tmp/postgresql_config.sh
-RUN rm /tmp/postgresql_config.sh
-
-# Install gems needed for API server
-RUN bundle install --gemfile=/usr/src/arvados/services/api/Gemfile
-
-# 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.
+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 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 Rails databases.
 ENV RAILS_ENV production
-ADD database.yml /usr/src/arvados/services/api/config/database.yml
-ADD config_rake.sh /tmp/config_rake.sh
-RUN /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 && \
+    mkdir tmp && \
+    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
+
+# Supervisor.
+ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
+ADD apache2_foreground.sh /etc/apache2/foreground.sh
+
+# Start the supervisor.
+CMD ["/usr/bin/supervisord", "-n"]