From 99c18b516a3dc1bb51eae9d9828d2c9958fc9c9b Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 17:25:39 -0300 Subject: [PATCH 1/6] Upgrade to Ruby 3.4.1 --- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.dev | 2 +- Gemfile | 2 +- Gemfile.lock | 14 +------------- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/.ruby-version b/.ruby-version index fa7adc7a..47b322c9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.4.1 diff --git a/Dockerfile b/Dockerfile index f9e54ca5..a4a1afe1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.4.1 ARG NODE_VERSION=22.7.0 # Use Node image so we can pull the binaries from here. diff --git a/Dockerfile.dev b/Dockerfile.dev index a83a3055..11c49975 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.4.1 ARG NODE_VERSION=22.7.0 # Use Node image so we can pull the binaries from here. diff --git a/Gemfile b/Gemfile index e0878827..d3d69907 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '~> 3.3.5' +ruby '~> 3.4.0' gem 'rails', '~> 7.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index f7039d9a..272a8145 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,8 +243,6 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-linux-gnu) flipper (1.3.2) concurrent-ruby (< 2) flipper-active_record (1.3.2) @@ -265,12 +263,6 @@ GEM google-protobuf (4.29.2) bigdecimal rake (>= 13) - google-protobuf (4.29.2-arm64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.29.2-x86_64-linux) - bigdecimal - rake (>= 13) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -369,10 +361,6 @@ GEM nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.17.2-arm64-darwin) - racc (~> 1.4) - nokogiri (1.17.2-x86_64-linux) - racc (~> 1.4) octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -680,7 +668,7 @@ DEPENDENCIES yaaf (~> 3.0) RUBY VERSION - ruby 3.3.5p100 + ruby 3.4.1p0 BUNDLED WITH 2.5.18 From e888eaf7ac69917b2441b8c34ff04f38ccb65a6e Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 17:31:26 -0300 Subject: [PATCH 2/6] Fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d3d69907..bcc92215 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '~> 3.4.0' +ruby '~> 3.4.1' gem 'rails', '~> 7.2.2' From 341ce4af4d3066d19b54b68f1f808010e8f1ac4c Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 19:28:15 -0300 Subject: [PATCH 3/6] Fix gemfile.lock --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 272a8145..d702c9c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,6 +243,8 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) flipper (1.3.2) concurrent-ruby (< 2) flipper-active_record (1.3.2) @@ -263,6 +265,12 @@ GEM google-protobuf (4.29.2) bigdecimal rake (>= 13) + google-protobuf (4.29.2-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.29.2-x86_64-linux) + bigdecimal + rake (>= 13) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) From 64c32f6111f4899a9b6afcf02dbaae2a35400348 Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 19:36:17 -0300 Subject: [PATCH 4/6] Use ruby file for gemfile --- Gemfile | 2 +- Gemfile.lock | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index bcc92215..65c61c18 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '~> 3.4.1' +ruby file: '.ruby-version' gem 'rails', '~> 7.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index d702c9c4..272a8145 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,8 +243,6 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-linux-gnu) flipper (1.3.2) concurrent-ruby (< 2) flipper-active_record (1.3.2) @@ -265,12 +263,6 @@ GEM google-protobuf (4.29.2) bigdecimal rake (>= 13) - google-protobuf (4.29.2-arm64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.29.2-x86_64-linux) - bigdecimal - rake (>= 13) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) From c522962ae35eee4ff8ff6907b6177632359c7b9a Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 19:51:14 -0300 Subject: [PATCH 5/6] Add .ruby-version file in docker container --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a4a1afe1..fcf6ac0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ WORKDIR $APP_HOME # Copy dependencies files and install libraries. COPY --link Gemfile Gemfile.lock package.json yarn.lock .yarnrc.yml ./ +COPY --link .ruby-version .ruby-version RUN corepack enable RUN gem install bundler && bundle install -j 4 && yarn install --immutable && \ From d48e28b01fcbbd47db3b12936e445162b3e4f4cd Mon Sep 17 00:00:00 2001 From: enzofab91 Date: Thu, 26 Dec 2024 19:56:34 -0300 Subject: [PATCH 6/6] Merge copy operations in a single one --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fcf6ac0f..9f0d0847 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,8 +37,7 @@ RUN mkdir -p $APP_HOME WORKDIR $APP_HOME # Copy dependencies files and install libraries. -COPY --link Gemfile Gemfile.lock package.json yarn.lock .yarnrc.yml ./ -COPY --link .ruby-version .ruby-version +COPY --link Gemfile Gemfile.lock package.json yarn.lock .yarnrc.yml .ruby-version ./ RUN corepack enable RUN gem install bundler && bundle install -j 4 && yarn install --immutable && \