X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e3e54264e8bc767e1ec773cff4e5bdf4c4934a36..18c93ee7a21912e9759b127a3ec73bb81c15f23d:/docker/doc/Dockerfile diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile index aa51a389c2..1492675275 100644 --- a/docker/doc/Dockerfile +++ b/docker/doc/Dockerfile @@ -5,8 +5,8 @@ maintainer Ward Vandewege # Install packages RUN /bin/mkdir -p /usr/src/arvados && \ - apt-get update -qq && \ - apt-get install -qqy curl procps apache2-mpm-worker + apt-get update -q && \ + apt-get install -qy curl procps apache2-mpm-worker ADD generated/doc.tar.gz /usr/src/arvados/ @@ -14,10 +14,11 @@ ADD generated/doc.tar.gz /usr/src/arvados/ RUN /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/doc/Gemfile && \ /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml && \ cd /usr/src/arvados/doc && \ - LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" /usr/local/rvm/bin/rvm-exec default bundle exec rake + LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" /usr/local/rvm/bin/rvm-exec default bundle exec rake generate arvados_api_host=api.dev.arvados arvados_workbench_host=workbench.dev.arvados + # Configure Apache -ADD apache2_vhost /etc/apache2/sites-available/doc +ADD generated/apache2_vhost /etc/apache2/sites-available/doc RUN \ a2dissite default && \ a2ensite doc