projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need to manually install python-pyasn1=0.1.7 python-pyasn1-modules=0.0.5 because...
[arvados.git]
/
docker
/
doc
/
Dockerfile
diff --git
a/docker/doc/Dockerfile
b/docker/doc/Dockerfile
index 6e4d1aa359bfbfaa0000d8e0e447de102f74957c..1492675275d1cb87ee2172cda186c0400c6493e4 100644
(file)
--- a/
docker/doc/Dockerfile
+++ b/
docker/doc/Dockerfile
@@
-5,19
+5,20
@@
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
-q
&& \
+ apt-get install -qy 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 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 && \
/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 generate arvados_api_host=api.dev.arvados arvados_workbench_host=workbench.dev.arvados
+
# Configure Apache
# Configure Apache
-ADD apache2_vhost /etc/apache2/sites-available/doc
+ADD
generated/
apache2_vhost /etc/apache2/sites-available/doc
RUN \
a2dissite default && \
a2ensite doc
RUN \
a2dissite default && \
a2ensite doc