Merge branch '4040-fuse-tests'

[arvados.git] / docker / passenger / Dockerfile

diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index 8bb017c673846613bff60da1de8e376e4d1c6adc..0201b4925376b9c1504f68fe9d54728e7f685110 100644 (file)
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -1,11 +1,19 @@
 # Arvados passenger image
 
 FROM arvados/base
-MAINTAINER Ward Vandewege <ward@clinicalfuture.com>
+MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # Install packages and build the passenger apache module
-RUN apt-get update ;\
-    apt-get install -q -y apt-utils git curl procps apache2-mpm-worker \
-                          libcurl4-openssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev ;\
-    passenger-install-apache2-module --auto
+
+RUN apt-get update -qq
+RUN apt-get install -qqy \
+        apt-utils git curl procps apache2-mpm-worker \
+        libcurl4-openssl-dev apache2-threaded-dev \
+        libapr1-dev libaprutil1-dev
+
+RUN cd /usr/src/arvados/services/api && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec passenger-install-apache2-module --auto
+
+RUN cd /usr/src/arvados/services/api && \
+    /usr/local/rvm/bin/rvm-exec default bundle exec passenger-install-apache2-module --snippet > /etc/apache2/conf.d/passenger