-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.