projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 372d0c9)
Merge branch 'master' of git.clinicalfuture.com:arvados
authorTim Pierce <twp@curoverse.com>
Tue, 11 Feb 2014 22:14:25 +0000 (17:14 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 11 Feb 2014 22:14:25 +0000 (17:14 -0500)
docker/doc/Dockerfile patch | blob | history
docker/doc/apache2_vhost patch | blob | history

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 5ae4bb273b34cbae22f63f3a1c005bb0fb05c6c0..39c87a88a1ca211b02966084144899538f2e29a2 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -13,7 +13,7 @@ ADD generated/doc.tar.gz /usr/src/arvados/
 # Build static site
 RUN /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" jekyll build
+    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" rake
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc
diff --git a/docker/doc/apache2_vhost b/docker/doc/apache2_vhost
index f3d4ff28ae7c0ce2d0517e3390fc34699409152a..bf9c18bb2090b67202b84218acb58ab771e88736 100644 (file)
--- a/docker/doc/apache2_vhost
+++ b/docker/doc/apache2_vhost
@@ -6,7 +6,7 @@ ServerName doc.arvados.org
 
   ServerName doc.arvados.org
 
-  DocumentRoot /usr/src/arvados/doc/_site/
+  DocumentRoot /usr/src/arvados/doc/.site/
 
 </VirtualHost>