X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/379717415ec5f772ab2f54e263c2c3f44d77f70f..11353b25e92155e86a2f1a5d7f9d7462fb8aa8a0:/docker/api/Dockerfile diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 5a1ef31384..6a3428c4a9 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -4,8 +4,8 @@ FROM arvados/passenger MAINTAINER Ward Vandewege # Install postgres and apache. -RUN apt-get update -qq -RUN apt-get install -qqy \ +RUN apt-get update -q +RUN apt-get install -qy \ 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 @@ -53,15 +53,15 @@ RUN mkdir -p /var/lib/arvados 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 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 generated/arvados-clients.yml /usr/src/arvados/services/api/config/ ADD .gitolite.rc /usr/local/arvados/config/ -ADD update-gitolite.rb /usr/local/arvados/ +RUN ln /usr/src/arvados/services/api/script/arvados-git-sync.rb /usr/local/bin/ # Supervisor. ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf