Merge branch 'master' into 2221-complete-docker

[arvados.git] / docker / doc / Dockerfile

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 5ae4bb273b34cbae22f63f3a1c005bb0fb05c6c0..6e4d1aa359bfbfaa0000d8e0e447de102f74957c 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -1,7 +1,7 @@
 # Arvados Documentation Docker container.
 
 FROM arvados/base
-maintainer Ward Vandewege <ward@clinicalfuture.com>
+maintainer Ward Vandewege <ward@curoverse.com>
 
 # Install packages
 RUN /bin/mkdir -p /usr/src/arvados && \
@@ -11,9 +11,10 @@ RUN /bin/mkdir -p /usr/src/arvados && \
 ADD generated/doc.tar.gz /usr/src/arvados/
 
 # Build static site
-RUN /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml && \
+RUN 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" jekyll build
+    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" rake
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc