Upgrade Ruby to 2.7.8

glacials · Oct 15, 2024 · 88cd1f9 · 88cd1f9
1 parent 93a239e
commit 88cd1f9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,9 +3,9 @@ require: rubocop-rails
 Layout/LineLength:
   Max: 120
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: "2.7.8" # Also update docker-compose.yml, docker-compose-production.yml, and Gemfile
   Include:
-    - '**/*.rb'
+    - "**/*.rb"
     - Rakefile
     - config.ru
   Exclude:
@@ -33,7 +33,7 @@ Layout/SpaceInsideHashLiteralBraces:
 
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
-  EnforcedColonStyle:      table
+  EnforcedColonStyle: table
 
 Style/FrozenStringLiteralComment:
   Enabled: false

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION
+ARG RUBY_VERSION=latest # docker compose overrides this
 FROM ruby:$RUBY_VERSION
 
 RUN wget https://dl.yarnpkg.com/debian/pubkey.gpg

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "2.7.1" # also update docker-compose.yml & docker-compose-production.yml
+ruby "2.7.8" # also update docker-compose.yml & docker-compose-production.yml
 
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -586,7 +586,7 @@ DEPENDENCIES
   websocket-driver!
 
 RUBY VERSION
-   ruby 2.7.1p83
+   ruby 2.7.8p225
 
 BUNDLED WITH
    2.2.15
diff --git a/docker-compose-production.yml b/docker-compose-production.yml
@@ -1,6 +1,5 @@
-version: '3.7'
-x-environment:
-  &server-environment
+version: "3.7"
+x-environment: &server-environment
   - ASSET_HOST
   - AWS_ACCESS_KEY_ID
   - AWS_REGION
@@ -42,8 +41,7 @@ x-environment:
   - PAYPAL_CLIENT_ID
   - PAYPAL_CLIENT_SECRET
   - PAYPAL_PLAN_ID=P-8X852520X76298909L7B74BY
-x-logging:
-  &default-logging
+x-logging: &default-logging
   driver: json-file
   options:
     max-size: 100m
@@ -56,7 +54,7 @@ x-app: &app
     cache_from:
       - "${REPOSITORY_URI:-splitsio}:latest"
     args:
-      RUBY_VERSION: "2.7.1" # also update docker-compose.yml & Gemfile
+      RUBY_VERSION: "2.7.8" # also update docker-compose.yml, Gemfile, and .rubocop.yml
   environment: *server-environment
   image: splitsio
   logging: *default-logging

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -42,7 +42,7 @@ x-app: &app
     context: .
     dockerfile: Dockerfile
     args:
-      RUBY_VERSION: "2.7.1" # also update docker-compose-production.yml, Gemfile, & .rubocop.yml
+      RUBY_VERSION: "2.7.8" # also update docker-compose-production.yml, Gemfile, and .rubocop.yml
   image: splitsio
   tmpfs:
     - /tmp