From 632ec2f93294cf276b2510c61636a3b6c38d11b6 Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Tue, 3 Oct 2017 11:08:37 -0500
Subject: [PATCH 1/3] Bump Travis to use Ruby 2.4

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5fa1319912e..d6bb4f0a9bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- '2.3.5'
+- '2.4.2'
 sudo: false
 cache:
   bundler: true

From fcdfda253007f6d8204de732307901f2430a3cfa Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Tue, 3 Oct 2017 11:09:00 -0500
Subject: [PATCH 2/3] Bump Dockerfile to use Ruby 2.4

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99752425781..d02e29eeb88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG REF=master
 # Set ENV, LANG only needed if building with docker-1.8
 ENV LANG en_US.UTF-8
 ENV TERM xterm
-ENV RUBY_GEMS_ROOT /opt/rubies/ruby-2.3.1/lib/ruby/gems/2.3.0
+ENV RUBY_GEMS_ROOT /opt/rubies/ruby-2.4.2/lib/ruby/gems/2.4.0
 ENV APP_ROOT /var/www/miq/vmdb
 ENV APPLIANCE_ROOT /opt/manageiq/manageiq-appliance
 ENV SUI_ROOT /opt/manageiq/manageiq-ui-service
@@ -103,8 +103,8 @@ RUN curl -sL https://github.com/postmodern/chruby/archive/v0.3.9.tar.gz | tar xz
     curl -sL https://github.com/postmodern/ruby-install/archive/v0.6.0.tar.gz | tar xz && \
     cd ruby-install-0.6.0 && \
     make install && \
-    ruby-install ruby 2.3.1 -- --disable-install-doc && \
-    echo "chruby ruby-2.3.1" >> ~/.bash_profile && \
+    ruby-install ruby 2.4.2 -- --disable-install-doc && \
+    echo "chruby ruby-2.4.2" >> ~/.bash_profile && \
     rm -rf /chruby-* && \
     rm -rf /usr/local/src/* && \
     yum clean all
@@ -123,7 +123,7 @@ ADD . ${APP_ROOT}
 
 ## Setup environment
 RUN ${APPLIANCE_ROOT}/setup && \
-    echo "export PATH=\$PATH:/opt/rubies/ruby-2.3.1/bin" >> /etc/default/evm && \
+    echo "export PATH=\$PATH:/opt/rubies/ruby-2.4.2/bin" >> /etc/default/evm && \
     mkdir ${APP_ROOT}/log/apache && \
     mv /etc/httpd/conf.d/ssl.conf{,.orig} && \
     echo "# This file intentionally left blank. ManageIQ maintains its own SSL configuration" > /etc/httpd/conf.d/ssl.conf && \

From 0f7d65de02a91769c8f709bd26a492c5f1a18d63 Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Tue, 3 Oct 2017 11:09:12 -0500
Subject: [PATCH 3/3] Drop support for Ruby 2.2

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 963914f67ae..5eb6bf6ac98 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-raise "Ruby versions less than 2.2.2 are unsupported!" if RUBY_VERSION < "2.2.2"
+raise "Ruby versions less than 2.3.5 are unsupported!" if RUBY_VERSION < "2.3.5"
 
 source 'https://rubygems.org'