ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

require ruby 2.7 

since we've started taking advantage of some ruby 2.7 only features,
in particular filter_map

Change-Id: Ie5f0e4f94018080c5c8cd2effff1eb0f234ea955
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/276268
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2021-10-19 11:08:14 -06:00
parent 88649d5d93
commit 0b87e99d23
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/_before.rb
View File

@ -30,7 +30,7 @@ if RUBY_ENGINE == 'truffleruby'
elsif RUBY_VERSION >= "3.0.0" && RUBY_VERSION < "3.1"
warn "Ruby 3.0+ support is experimental" unless ENV['SUPPRESS_RUBY_WARNING']
end
ruby '>= 2.6.0', '< 3.1'
ruby '>= 2.7.0', '< 3.1'
# force a different lockfile for next rails
unless CANVAS_RAILS6_0

4
Jenkinsfile.docker-sync
View File

@ -27,10 +27,6 @@ final SYNC_IMAGES = [
job: null,
target: 'starlord.inscloudgate.net/jenkins/dockerfile:1.0-experimental',
],
'instructure/ruby-passenger:2.6': [
job: null,
target: 'starlord.inscloudgate.net/jenkins/ruby-passenger:2.6',
],
'instructure/ruby-passenger:2.7': [
job: '/Canvas/main-postmerge',
target: 'starlord.inscloudgate.net/jenkins/ruby-passenger:2.7',

2
build/ubuntu.Dockerfile.template
View File

@ -1,4 +1,4 @@
<% ruby_passenger = '2.6' -%>
<% ruby_passenger = '2.7' -%>
<%= generation_message %>
# For documentation, please check doc/docker/README.md in
# this local repo which is also published at:

2
ubuntu.development.Dockerfile
View File

@ -5,7 +5,7 @@
# For documentation, please check doc/docker/README.md in
# this local repo which is also published at:
# https://github.com/instructure/canvas-lms/tree/master/doc/docker
ARG RUBY_PASSENGER=2.6
ARG RUBY_PASSENGER=2.7
FROM instructure/ruby-passenger:$RUBY_PASSENGER
ARG POSTGRES=9.5

2
ubuntu.production.Dockerfile
View File

@ -5,7 +5,7 @@
# For documentation, please check doc/docker/README.md in
# this local repo which is also published at:
# https://github.com/instructure/canvas-lms/tree/master/doc/docker
FROM instructure/ruby-passenger:2.6
FROM instructure/ruby-passenger:2.7
ENV APP_HOME /usr/src/app/
ENV RAILS_ENV "production"