projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4823: Revert FUSE changes unrelated to ThreadSafeApiCache
[arvados.git]
/
docker
/
doc
/
Dockerfile
diff --git
a/docker/doc/Dockerfile
b/docker/doc/Dockerfile
index 3992881a8587792d5b41b690abc5a047e5951dd6..aa51a389c2b6ccfa13524fdaf1544981f84c20d3 100644
(file)
--- a/
docker/doc/Dockerfile
+++ b/
docker/doc/Dockerfile
@@
-5,15
+5,16
@@
maintainer Ward Vandewege <ward@curoverse.com>
# Install packages
RUN /bin/mkdir -p /usr/src/arvados && \
# Install packages
RUN /bin/mkdir -p /usr/src/arvados && \
- apt-get update && \
- apt-get install -q
-
y curl procps apache2-mpm-worker
+ apt-get update
-qq
&& \
+ apt-get install -q
q
y curl procps apache2-mpm-worker
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" 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
# Configure Apache
ADD apache2_vhost /etc/apache2/sites-available/doc