Merge branch 'master' of git.curoverse.com:arvados #2751

[arvados.git] / docker / base / Dockerfile

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index e20fd0057a9af6a5c94e9949742867282218fd0b..e6ec0f94f6b67dd7dc1d4c442963412e1f3b6dc1 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -12,12 +12,13 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get -q -y install -q -y openssh-server apt-utils git curl \
-            libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
-            postgresql-server-dev-9.1 && \
+             libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
+             postgresql-server-dev-9.1 && \
     /bin/mkdir -p /root/.ssh && \
     /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     /usr/sbin/locale-gen && \
-    curl -L https://get.rvm.io | bash -s stable --ruby=2.1.0 && \
+    curl -L https://get.rvm.io | bash -s stable && \
+    /usr/local/rvm/bin/rvm install 2.1.0 && \
     /bin/mkdir -p /usr/src/arvados
 
 ADD generated/arvados.tar.gz /usr/src/arvados/