X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a11bbe0d425cc2733e6f70adfda071336fb6522c..d533fffba8615a3e4d370ed1f7cdd810cdb4eee3:/docker/api/Dockerfile diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 7a87beb20e..d7fe554e92 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -1,11 +1,17 @@ # Arvados API server Docker container. FROM arvados/passenger -MAINTAINER Tim Pierce - -# Install postgres and apache -RUN apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 \ - supervisor +MAINTAINER Tim Pierce + +# 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 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/ @@ -34,10 +40,10 @@ RUN sh /tmp/config_databases.sh && \ # Configure Apache and Passenger. ADD passenger.conf /etc/apache2/conf.d/passenger -RUN a2dissite default ; \ - a2ensite arvados ; \ - a2enmod rewrite ; \ - a2enmod ssl ; \ +RUN a2dissite default && \ + a2ensite arvados && \ + a2enmod rewrite && \ + a2enmod ssl && \ /bin/mkdir /var/run/apache2 # Supervisor.