From a94c61ad51c59dc81d1ac2636e3339e880607e66 Mon Sep 17 00:00:00 2001
From: glacials <qhiiyr@gmail.com>
Date: Tue, 7 Jan 2020 11:41:26 -0800
Subject: [PATCH] Update Ruby to 2.7.0

---
 Dockerfile                    | 1 -
 Dockerfile-production         | 1 -
 Gemfile                       | 2 +-
 docker-compose-production.yml | 2 +-
 docker-compose.yml            | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05e6babab..99c986e40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,6 @@ ENV BUNDLE_BIN $BUNDLE_PATH/bin
 ENV PATH /app/bin:$BUNDLE_BIN:$PATH
 
 RUN gem update --system
-RUN gem install bundler -v 2.1.0
 
 RUN mkdir -p /app
 WORKDIR /app
diff --git a/Dockerfile-production b/Dockerfile-production
index 5b6fe6e51..4ff3fe13a 100644
--- a/Dockerfile-production
+++ b/Dockerfile-production
@@ -21,7 +21,6 @@ ENV RAILS_ENV=production
 ENV NODE_ENV=production
 
 RUN gem update --system
-RUN gem install bundler -v 2.1.0
 
 RUN mkdir -p /app
 WORKDIR /app
diff --git a/Gemfile b/Gemfile
index 135817e18..89e8e806d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.6.5'
+ruby '2.7.0'
 
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index 084897d5b..377a12804 100644
--- a/docker-compose-production.yml
+++ b/docker-compose-production.yml
@@ -51,7 +51,7 @@ x-app: &app
     cache_from:
       - "${REPOSITORY_URI:-splitsio-production}:latest"
     args:
-      RUBY_VERSION: '2.6.5' # also update docker-compose.yml & Gemfile
+      RUBY_VERSION: '2.7.0' # also update docker-compose.yml & Gemfile
       SPLITSIO_CLIENT_ID: $SPLITSIO_CLIENT_ID
       STRIPE_PUBLISHABLE_KEY: $STRIPE_PUBLISHABLE_KEY
   environment: *server-environment
diff --git a/docker-compose.yml b/docker-compose.yml
index d57038bbb..f9ee3052f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ x-app: &app
     cache_from:
       - "${REPOSITORY_URI:-splitsio-dev}:latest"
     args:
-      RUBY_VERSION: '2.6.5' # also update docker-compose-production.yml & Gemfile
+      RUBY_VERSION: '2.7.0' # also update docker-compose-production.yml & Gemfile
   image: splitsio-dev
   tmpfs:
     - /tmp