Merge branch 'master' into 3198-writable-fuse

[arvados.git] / docker / doc / Dockerfile

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index aa51a389c2b6ccfa13524fdaf1544981f84c20d3..d890710c4641c349b58811d41d22595aed2d68d5 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -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