X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2b5d9607892a48d32401ff59516e8d73234eee89..refs/heads/5653-arv-copy-multiple-branches-wip:/docker/api/Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 3c1a5afe61..5a1ef31384 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,56 +1,75 @@
 # Arvados API server Docker container.
 
 FROM arvados/passenger
-MAINTAINER Tim Pierce <twp@curoverse.com>
+MAINTAINER Ward Vandewege <ward@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 apt-get update -qq
+RUN apt-get install -qqy \
+    procps postgresql postgresql-server-dev-9.1 slurm-llnl munge \
+    supervisor sudo libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
+    libjson-perl cron openssh-server
+
+ADD munge.key /etc/munge/
+RUN chown munge:munge /etc/munge/munge.key && chmod 600 /etc/munge/munge.key
+ADD generated/slurm.conf /etc/slurm-llnl/
+
+RUN /usr/local/rvm/bin/rvm-exec default gem install arvados-cli arvados
+# /for crunch-dispatch
 
 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
+RUN /bin/cp /usr/src/arvados/services/api/config/environments/production.rb.example /usr/src/arvados/services/api/config/environments/production.rb
+ADD generated/application.yml /usr/src/arvados/services/api/config/application.yml
 
 # Configure Rails databases.
 ENV RAILS_ENV production
 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 && \
+RUN /usr/local/rvm/bin/rvm-exec default 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) && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec rake db:structure:load && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec rake db:seed && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec rake assets:precompile && \
+    /usr/local/rvm/bin/rvm-exec default ./script/create_superuser_token.rb $(cat /tmp/superuser_token) && \
     chown www-data:www-data config.ru && \
     chown www-data:www-data log -R && \
     mkdir -p 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
+# 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 keep_server_0.json /root/
+ADD 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/
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
-ADD apache2_foreground.sh /etc/apache2/foreground.sh
+ADD generated/setup.sh /usr/local/bin/setup.sh
+ADD generated/setup-gitolite.sh /usr/local/bin/setup-gitolite.sh
+ADD crunch-dispatch-run.sh /usr/local/bin/crunch-dispatch-run.sh
+ADD munge.sh /usr/local/bin/munge.sh
+ADD passenger.sh /usr/local/bin/passenger.sh
 
 # Start the supervisor.
 CMD ["/usr/bin/supervisord", "-n"]