projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3825-crunch-pipe-to-arv-put-final'
[arvados.git]
/
docker
/
doc
/
Dockerfile
diff --git
a/docker/doc/Dockerfile
b/docker/doc/Dockerfile
index 5ae4bb273b34cbae22f63f3a1c005bb0fb05c6c0..783874f0ce343837b0fd186ab38962c424bf5740 100644
(file)
--- a/
docker/doc/Dockerfile
+++ b/
docker/doc/Dockerfile
@@
-1,7
+1,7
@@
# Arvados Documentation Docker container.
FROM arvados/base
# Arvados Documentation Docker container.
FROM arvados/base
-maintainer Ward Vandewege <ward@c
linicalfutur
e.com>
+maintainer Ward Vandewege <ward@c
urovers
e.com>
# Install packages
RUN /bin/mkdir -p /usr/src/arvados && \
# 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
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 /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 && \
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"
/usr/local/rvm/bin/rvm-exec default bundle exec rake
# Configure Apache
ADD apache2_vhost /etc/apache2/sites-available/doc
# Configure Apache
ADD apache2_vhost /etc/apache2/sites-available/doc