-# 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
+# Install a token for root
+RUN mkdir -p /root/.config/arvados; echo "ARVADOS_API_HOST=api" >> /root/.config/arvados/settings.conf && echo "ARVADOS_API_HOST_INSECURE=yes" >> /root/.config/arvados/settings.conf && echo "ARVADOS_API_TOKEN=$(cat /tmp/superuser_token)" >> /root/.config/arvados/settings.conf && chmod 600 /root/.config/arvados/settings.conf
+
+# Set up directory for job commit repo
+RUN mkdir -p /var/lib/arvados
+# Add crunch user
+RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid 4005 crunch && chown crunch:crunch /home/crunch
+
+# Create keep and compute node objects
+ADD generated/keep_server_0.json /root/
+ADD generated/keep_server_1.json /root/
+ADD keep_proxy.json /root/
+
+# Set up update-gitolite.rb
+RUN mkdir /usr/local/arvados/config -p
+ADD generated/arvados-clients.yml /usr/local/arvados/config/
+ADD .gitolite.rc /usr/local/arvados/config/
+ADD update-gitolite.rb /usr/local/arvados/