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 6e4d1aa359bfbfaa0000d8e0e447de102f74957c..783874f0ce343837b0fd186ab38962c424bf5740 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -11,10 +11,10 @@ RUN /bin/mkdir -p /usr/src/arvados && \
 ADD generated/doc.tar.gz /usr/src/arvados/
 
 # Build static site
-RUN bundle install --gemfile=/usr/src/arvados/doc/Gemfile && \
+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" rake
+    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