3114: Merge branch 'master' into 3114-copy-to-project

[arvados.git] / docker / doc / Dockerfile

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 0473e87a658fe5555be2e9d6cc6eefca21649790..783874f0ce343837b0fd186ab38962c424bf5740 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -1,23 +1,25 @@
 # 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 ;\
-    apt-get update ;\
+RUN /bin/mkdir -p /usr/src/arvados && \
+    apt-get update && \
     apt-get install -q -y curl procps apache2-mpm-worker
 
 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
+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
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc
 RUN \
-  a2dissite default ;\
+  a2dissite default && \
   a2ensite doc
 
 ADD apache2_foreground.sh /etc/apache2/foreground.sh