Skip to content

Commit

Permalink
MRI 3.1 (#390)
Browse files Browse the repository at this point in the history
* MRI 3.1

* Update package json

* Update node

* update dockers

---------

Co-authored-by: Franck Kerbiriou <[email protected]>
  • Loading branch information
mdouchement and FranckKe authored Nov 11, 2023
1 parent 1820ad1 commit fc16914
Show file tree
Hide file tree
Showing 9 changed files with 2,485 additions and 2,030 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.1.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ruby build stage
FROM ruby:2.7-alpine as ruby-build-env
FROM ruby:3.1-alpine as ruby-build-env
MAINTAINER mdouchement

# Set the locale
Expand Down Expand Up @@ -72,7 +72,7 @@ RUN rm -rf frontend .git


# final stage
FROM ruby:2.7-alpine
FROM ruby:3.1-alpine
MAINTAINER mdouchement

# Set the locale
Expand Down
13 changes: 9 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ gem 'wysiwyg-rails', '~> 2'
gem 'bugsnag', '~> 6.6'
gem 'nokogiri', '~> 1.13'

# MRI 3.1 with Rails 6 fix
gem "net-imap"
gem "net-pop"
gem "net-smtp"

group :development do
gem 'annotate'
# gem 'debbie', git: 'https://github.com/mdouchement/debbie'
Expand All @@ -56,11 +61,11 @@ end

group :test do
# Rspec
gem 'rspec-rails', '~> 3.7'
gem 'factory_bot_rails', '~> 4.8'
gem 'faker', '~> 1.8'
gem 'rspec-rails', '~> 5'
gem 'factory_bot_rails', '~> 6'
gem 'faker', '~> 2'
gem 'shoulda-matchers', '~> 3.1'
gem 'pundit-matchers', '~> 1.4'
gem 'database_cleaner', '~> 1.7'
gem 'json-schema', '~> 2.8'
gem 'json-schema', '~> 3'
end
68 changes: 40 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ GEM
zeitwerk (~> 2.6)
erubi (1.11.0)
execjs (2.8.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (1.9.6)
i18n (>= 0.7)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
Expand Down Expand Up @@ -165,8 +165,8 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.6.2)
json-schema (2.8.1)
addressable (>= 2.4)
json-schema (3.0.0)
addressable (>= 2.8)
jwt (2.5.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -199,6 +199,14 @@ GEM
mini_mime (1.1.2)
minitest (5.16.3)
nested_form (0.3.2)
net-imap (0.3.1)
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.1.3)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.13.9-x86_64-darwin)
racc (~> 1.4)
Expand Down Expand Up @@ -291,23 +299,23 @@ GEM
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.5)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.4)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
rspec-support (~> 3.12.0)
rspec-rails (5.1.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.12.0)
rubocop (1.39.0)
json (~> 2.3)
parallel (~> 1.10)
Expand Down Expand Up @@ -373,6 +381,7 @@ GEM
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.11)
timeout (0.3.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
Expand Down Expand Up @@ -411,15 +420,18 @@ DEPENDENCIES
devise-i18n (~> 1)
devise-jwt (~> 0.8)
dotenv-rails
factory_bot_rails (~> 4.8)
faker (~> 1.8)
factory_bot_rails (~> 6)
faker (~> 2)
http (~> 5.0.0.pre2)
http_accept_language (~> 2)
i18n-js (~> 3)
image_processing (~> 1.12)
json-schema (~> 2.8)
json-schema (~> 3)
leaflet-rails (~> 1)
listen
net-imap
net-pop
net-smtp
nokogiri (~> 1.13)
pg (~> 1)
postmark (~> 1)
Expand All @@ -436,7 +448,7 @@ DEPENDENCIES
rails_admin_state (~> 1)
rb-readline
recaptcha
rspec-rails (~> 3.7)
rspec-rails (~> 5)
rubocop
sass-rails (~> 5)
seed_dump
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
nginx:
image: nginx:1.15-alpine
image: nginx:1.23-alpine
ports:
- 8042:80
links:
Expand Down Expand Up @@ -32,7 +32,7 @@ services:
restart: always

postgres:
image: postgres:9.6-alpine
image: postgres:15-alpine
ports:
- 127.0.0.1:5433:5432
environment:
Expand Down
2 changes: 1 addition & 1 deletion frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/fermium
lts/gallium
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-vue": "^5.2.3",
"glob-all": "^3.1.0",
"node-sass": "^4.13.1",
"node-sass": "^8.0.0",
"prettier": "^1.18.2",
"sass-loader": "^8.0.0",
"sass-loader": "^10.0.0",
"vue-cli-plugin-i18n": "^0.6.0",
"vue-template-compiler": "^2.5.16"
},
Expand Down
Loading

0 comments on commit fc16914

Please sign in to comment.