Merge branch 'master' into github-3408-production-datamanager

[arvados.git] / docker / passenger / Dockerfile

diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index e6254bd9489b333d4ad8375991e361950ad6cee9..77aeb6606b0a8339a225cda6bcbd1b4c3b3ceefd 100644 (file)
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -4,12 +4,15 @@ FROM arvados/base
 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 && \
-    cd /usr/src/arvados/services/api && \
-    /usr/local/rvm/bin/rvm-exec default bundle exec passenger-install-apache2-module --auto
+
+RUN apt-get update -q
+RUN apt-get install -qy \
+        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 --languages ruby
 
 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