From d81de7aaf9b318303ac660f0c08ca3682621ade5 Mon Sep 17 00:00:00 2001 From: Xander Moffatt Date: Mon, 9 Jan 2023 11:31:39 -0700 Subject: [PATCH] upgrade to ruby 2.7 why: * so that this repo can work with m1 macs test plan: * docker-compose build still works * docker-compose up * navigating to originality.docker works --- Dockerfile | 4 ++-- Gemfile | 4 ++-- Gemfile.lock | 29 +++++++++++++++++++++++------ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index def2960..2aa0c3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ruby:2.6 +FROM ruby:2.7 RUN apt-get update && apt-get install -qq -y --no-install-recommends \ - build-essential nodejs libpq-dev + build-essential nodejs libpq-dev python ENV APP_HOME='/usr/src/app' RAILS_LOG_TO_STDOUT='true' REDIS_CACHE='true' RUN mkdir -p $APP_HOME WORKDIR $APP_HOME diff --git a/Gemfile b/Gemfile index e076a28..9420eaa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -ruby '2.6.8' +ruby '2.7.7' source 'https://rubygems.org' git_source(:github) do |repo_name| @@ -18,7 +18,7 @@ gem 'ims-lti', git: 'https://github.com/instructure/ims-lti.git', branch: 'ws_se gem 'jbuilder', '~> 2.5' gem 'jquery-rails' gem 'json-jwt' -gem 'mini_racer', '~> 0.2.6' +gem 'mini_racer', '~> 0.6.3' gem 'pg', '~> 0.18' gem 'puma', '~> 3.0' gem 'rack-timeout', '~> 0.4' diff --git a/Gemfile.lock b/Gemfile.lock index e23f125..3d49560 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,11 @@ GEM activesupport aes_key_wrap bindata - libv8 (7.3.492.27.1) + libv8-node (16.10.0.0) + libv8-node (16.10.0.0-arm64-darwin) + libv8-node (16.10.0.0-x86_64-darwin) + libv8-node (16.10.0.0-x86_64-darwin-19) + libv8-node (16.10.0.0-x86_64-linux) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -104,8 +108,8 @@ GEM method_source (0.9.0) mini_mime (1.0.0) mini_portile2 (2.8.0) - mini_racer (0.2.6) - libv8 (>= 6.9.411) + mini_racer (0.6.3) + libv8-node (~> 16.10.0.0) minitest (5.11.3) multi_json (1.12.2) multi_xml (0.6.0) @@ -114,6 +118,12 @@ GEM nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.9-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.9-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.9-x86_64-linux) + racc (~> 1.4) parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) @@ -212,6 +222,8 @@ GEM tilt (>= 1.1, < 3) sassc (2.1.0) ffi (~> 1.9) + sassc (2.1.0-x86_64-linux) + ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) @@ -253,7 +265,12 @@ GEM websocket-extensions (0.1.3) PLATFORMS + arm64-darwin-20 ruby + x86_64-darwin-18 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-linux DEPENDENCIES bootstrap (~> 4.3.1) @@ -265,7 +282,7 @@ DEPENDENCIES jquery-rails json-jwt listen (~> 3.0.5) - mini_racer (~> 0.2.6) + mini_racer (~> 0.6.3) pg (~> 0.18) puma (~> 3.0) rack-mini-profiler (~> 0.10) @@ -285,7 +302,7 @@ DEPENDENCIES web-console (~> 3.3.0) RUBY VERSION - ruby 2.4.1p111 + ruby 2.7.7p221 BUNDLED WITH - 1.15.4 + 2.1.4