Update package-test images to ruby 2.3

diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile
index d38507a2416bbfb38cdb735339b7d5c9a297bcd3..46229cf60f3eac9a7cc4dd9f43f2120399711d1a 100644 (file)
--- a/build/package-test-dockerfiles/centos6/Dockerfile
+++ b/build/package-test-dockerfiles/centos6/Dockerfile
@@ -8,8 +8,8 @@ RUN yum -q install --assumeyes scl-utils centos-release-scl \
 RUN touch /var/lib/rpm/* && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
     /usr/local/rvm/bin/rvm-exec default gem install bundle && \
     /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
 

diff --git a/build/package-test-dockerfiles/centos7/Dockerfile b/build/package-test-dockerfiles/centos7/Dockerfile
index 6bc40bffa56fac9bdffe85ccce65416ae016aaac..06a39ca397979e022028e727ba563253bbaa777d 100644 (file)
--- a/build/package-test-dockerfiles/centos7/Dockerfile
+++ b/build/package-test-dockerfiles/centos7/Dockerfile
@@ -7,8 +7,8 @@ RUN yum -q -y install scl-utils centos-release-scl which tar
 RUN touch /var/lib/rpm/* && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
     /usr/local/rvm/bin/rvm-exec default gem install bundle && \
     /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
 

diff --git a/build/package-test-dockerfiles/debian7/Dockerfile b/build/package-test-dockerfiles/debian7/Dockerfile
index c9a2fdc682c1d115f0a0f13bb5ef0ef1ad62f623..c85d24c49e65dcbccd0460e2e10038e5f36f66da 100644 (file)
--- a/build/package-test-dockerfiles/debian7/Dockerfile
+++ b/build/package-test-dockerfiles/debian7/Dockerfile
@@ -2,11 +2,12 @@ FROM debian:7
 MAINTAINER Peter Amstutz <peter.amstutz@curoverse.com>
 
 # Install RVM
-RUN apt-get update && apt-get -y install curl procps && \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl procps && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3
 
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled

diff --git a/build/package-test-dockerfiles/debian8/Dockerfile b/build/package-test-dockerfiles/debian8/Dockerfile
index cde18472333cdc59e9421a24fecc5f10d1611d38..9283db23cb696b720fdb86a51f359b19c3c0cbb4 100644 (file)
--- a/build/package-test-dockerfiles/debian8/Dockerfile
+++ b/build/package-test-dockerfiles/debian8/Dockerfile
@@ -2,11 +2,12 @@ FROM debian:8
 MAINTAINER Peter Amstutz <peter.amstutz@curoverse.com>
 
 # Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3
 
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled

diff --git a/build/package-test-dockerfiles/ubuntu1204/Dockerfile b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
index 0cb77c8f8a92a2bbc18bd9005b7a4246d66b48a4..decab6c846a943c7848fec5e80d1ef2e68a2412d 100644 (file)
--- a/build/package-test-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
@@ -2,13 +2,14 @@ FROM ubuntu:precise
 MAINTAINER Peter Amstutz <peter.amstutz@curoverse.com>
 
 # Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3
 
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled
 
-RUN echo "deb file:///arvados/packages/ubuntu1204/ /" >>/etc/apt/sources.list
\ No newline at end of file
+RUN echo "deb file:///arvados/packages/ubuntu1204/ /" >>/etc/apt/sources.list

diff --git a/build/package-test-dockerfiles/ubuntu1404/Dockerfile b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
index 6c4d0e9b51f3c3a7f6acd27e4eec0f7c7cf413ad..3e08600fdecb5957fe308f9f5fa585a52f508a1f 100644 (file)
--- a/build/package-test-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
@@ -2,13 +2,14 @@ FROM ubuntu:trusty
 MAINTAINER Peter Amstutz <peter.amstutz@curoverse.com>
 
 # Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
-    /usr/local/rvm/bin/rvm install 2.1 && \
-    /usr/local/rvm/bin/rvm alias create default ruby-2.1
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3
 
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled
 
-RUN echo "deb file:///arvados/packages/ubuntu1404/ /" >>/etc/apt/sources.list
\ No newline at end of file
+RUN echo "deb file:///arvados/packages/ubuntu1404/ /" >>/etc/apt/sources.list