* Mention SSO server to documentation in README

[arvados.git] / docker / docserver / Dockerfile

diff --git a/docker/docserver/Dockerfile b/docker/docserver/Dockerfile
index 53f5bc60014bc2c9be93793fbd5a18ddbe546b0c..0473e87a658fe5555be2e9d6cc6eefca21649790 100644 (file)
--- a/docker/docserver/Dockerfile
+++ b/docker/docserver/Dockerfile
@@ -3,22 +3,16 @@
 FROM arvados/base
 maintainer Ward Vandewege <ward@clinicalfuture.com>
 
-env DEBIAN_FRONTEND noninteractive
-
 # Install packages
-# Fix Locale
-# Build static site
-# Update Arvados source
-RUN \
+RUN /bin/mkdir -p /usr/src/arvados ;\
     apt-get update ;\
-    apt-get install -q -y curl procps apache2-mpm-worker locales ;\
-    /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen ;\
-    /usr/sbin/locale-gen ;\
-    gem install jekyll RedCloth ;\
-    /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 ;\
-    cd /usr/src/arvados ;\
-    git pull
+    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
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc
@@ -26,13 +20,7 @@ RUN \
   a2dissite default ;\
   a2ensite doc
 
-# Finally, start Apache
-env APACHE_RUN_USER    www-data
-env APACHE_RUN_GROUP   www-data
-env APACHE_PID_FILE    /var/run/apache2.pid
-env APACHE_RUN_DIR     /var/run/apache2
-env APACHE_LOCK_DIR    /var/lock/apache2
-env APACHE_LOG_DIR     /var/log/apache2
-env LANG               C
+ADD apache2_foreground.sh /etc/apache2/foreground.sh
 
-cmd ["/usr/sbin/apache2", "-D", "FOREGROUND"]
+# Start Apache
+CMD ["/etc/apache2/foreground.sh"]