3706: Prefer "is None" and "is not None" to "== None" and "!= None".

[arvados.git] / docker / passenger / Dockerfile

diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index 45ef9ae50bf0123b7c490e2be07701b2eb1bba49..e6254bd9489b333d4ad8375991e361950ad6cee9 100644 (file)
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -1,12 +1,16 @@
 # 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
+    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