From 5e0139fe94d37b9ff8b702df1e20480a015c0304 Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Sat, 7 Jan 2023 15:24:40 -0800 Subject: [PATCH] Ruby 3.2.0 --- .dockerignore | 1 + .ruby-version | 2 +- Dockerfile | 2 +- Gemfile.lock | 44 ++++++++++++++++++++++---------------------- bin/prod_server | 1 + 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.dockerignore b/.dockerignore index 9cca09e..b2f6d7b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -23,6 +23,7 @@ ubuntu-*-cloudimg-console.log # entries above are copied from .gitignore +/bin/eb-deploy /.dockerenv.example /.dockerignore /.ebextensions diff --git a/.ruby-version b/.ruby-version index ef538c2..944880f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.2.0 diff --git a/Dockerfile b/Dockerfile index 4ac6ffd..3a2ba3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # Push to public ECR: # docker buildx imagetools create -t public.ecr.aws/stefansundin/rssbox stefansundin/rssbox -FROM stefansundin/ruby:3.1 +FROM stefansundin/ruby:3.2 LABEL org.opencontainers.image.authors="Stefan Sundin" LABEL org.opencontainers.image.url="https://github.com/stefansundin/rssbox" diff --git a/Gemfile.lock b/Gemfile.lock index 716f7dc..00996c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,20 +19,20 @@ GEM sax-machine (>= 1.0) github-release-party (0.4.0) rake (>= 12) - io-console (0.5.11) - irb (1.4.2) + io-console (0.6.0) + irb (1.6.2) reline (>= 0.3.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) method_source (1.0.0) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - newrelic_rpm (8.11.0) + newrelic_rpm (8.14.0) nio4r (2.5.8) - nokogiri (1.13.9) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) opengraph_parser (0.2.5) @@ -47,35 +47,35 @@ GEM pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - public_suffix (5.0.0) - puma (6.0.0) + public_suffix (5.0.1) + puma (6.0.2) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.4) - rack-protection (3.0.2) + racc (1.6.2) + rack (2.2.5) + rack-protection (3.0.5) rack rack-ssl-enforcer (0.2.9) rake (13.0.6) rbtree3 (0.7.0) redis (5.0.5) redis-client (>= 0.9.0) - redis-client (0.10.0) + redis-client (0.11.2) connection_pool - reline (0.3.1) + reline (0.3.2) io-console (~> 0.5) ruby2_keywords (0.0.5) sax-machine (1.3.2) - secure_headers (6.4.0) - sinatra (3.0.2) + secure_headers (6.5.0) + sinatra (3.0.5) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.2) + rack-protection (= 3.0.5) tilt (~> 2.0) - sinatra-contrib (3.0.2) + sinatra-contrib (3.0.5) multi_json mustermann (~> 3.0) - rack-protection (= 3.0.2) - sinatra (= 3.0.2) + rack-protection (= 3.0.5) + sinatra (= 3.0.5) tilt (~> 2.0) slop (3.6.0) thor (1.2.1) @@ -84,7 +84,7 @@ GEM concurrent-ruby (~> 1.0) PLATFORMS - ruby + arm64-darwin-22 DEPENDENCIES addressable @@ -111,7 +111,7 @@ DEPENDENCIES tzinfo RUBY VERSION - ruby 3.1.2p20 + ruby 3.2.0p0 BUNDLED WITH - 2.3.24 + 2.4.3 diff --git a/bin/prod_server b/bin/prod_server index bcbba5f..d9a9de6 100755 --- a/bin/prod_server +++ b/bin/prod_server @@ -1,4 +1,5 @@ #!/bin/bash # export RUBYOPT="--jit --jit-verbose=1" +# export RUBYOPT="--yjit" export APP_ENV=production bundle exec puma -C config/puma.rb "$@"