From a3dec89eb79fcbff4cc349869ede616dc2efd908 Mon Sep 17 00:00:00 2001 From: Colby Swandale <996377+colby-swandale@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:14:28 +1100 Subject: [PATCH 1/4] Update Ruby to 3.3.5 Also declare the Ruby version inside the Gemfile --- .github/workflows/test.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile | 2 ++ Gemfile.lock | 5 ++++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da2994f..d2524b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0.3" + ruby-version: .ruby-version bundler-cache: true - name: Wait for MySQL to boot diff --git a/.ruby-version b/.ruby-version index 15a2799..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +3.3.5 diff --git a/Dockerfile b/Dockerfile index c2b9dc8..3fbcc56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.0-alpine3.18 +FROM ruby:3.3.5-alpine3.18 ARG KRANE_VERSION=3.0.1 ARG KUBECTL_VERSION=1.26.3 diff --git a/Gemfile b/Gemfile index 14dcded..5c72e3e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source 'https://rubygems.org' +ruby file: ".ruby-version" + gem 'rails', '~> 7.0.8' gem 'mysql2' gem 'puma', '~> 6.4' diff --git a/Gemfile.lock b/Gemfile.lock index b7cdd37..9aa66f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -363,5 +363,8 @@ DEPENDENCIES sidekiq web-console (>= 3.3.0) +RUBY VERSION + ruby 3.3.5p100 + BUNDLED WITH - 2.5.5 + 2.5.21 From f20bed2fdce13a9728663e9f40b4f533d972c06e Mon Sep 17 00:00:00 2001 From: Colby Swandale <996377+colby-swandale@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:16:49 +1100 Subject: [PATCH 2/4] Update Docker image to latest alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3fbcc56..79e4ad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.5-alpine3.18 +FROM ruby:3.3.5-alpine3.20 ARG KRANE_VERSION=3.0.1 ARG KUBECTL_VERSION=1.26.3 From 6c60eb4ef764e91cb050b464ee7e561cbd87132a Mon Sep 17 00:00:00 2001 From: Colby Swandale <996377+colby-swandale@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:49:30 +1100 Subject: [PATCH 3/4] Add base64 bigdecimal json gems to Gemfile & add platforms --- Gemfile | 4 ++++ Gemfile.lock | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/Gemfile b/Gemfile index 5c72e3e..94052a9 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,10 @@ gem 'rails', '~> 7.0.8' gem 'mysql2' gem 'puma', '~> 6.4' gem 'bootsnap', '>= 1.4.2', require: false +gem 'base64', '~> 0.2.0' +gem 'bigdecimal', '~> 3.1' +gem 'mutex_m', '~> 0.2.0' +gem 'json', '~> 2.7' group :development do gem 'web-console', '>= 3.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9aa66f9..f56348f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,6 +78,8 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) + base64 (0.2.0) + bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) @@ -142,6 +144,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (2.7.2) jwt (2.7.1) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -165,6 +168,7 @@ GEM msgpack (1.7.2) multi_xml (0.6.0) multipart-post (2.3.0) + mutex_m (0.2.0) mysql2 (0.5.6) net-imap (0.4.11) date @@ -179,6 +183,14 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-linux) + racc (~> 1.4) oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) @@ -350,12 +362,22 @@ GEM zeitwerk (2.6.14) PLATFORMS + aarch64-linux + arm64-darwin + arm64-linux ruby + x86_64-darwin + x86_64-linux + x86_64-linux-musl DEPENDENCIES + base64 (~> 0.2.0) + bigdecimal (~> 3.1) bootsnap (>= 1.4.2) byebug + json (~> 2.7) listen (>= 3.0.5) + mutex_m (~> 0.2.0) mysql2 puma (~> 6.4) rails (~> 7.0.8) From 4c51133744e57690f31e85186a4ee2f1796c91f9 Mon Sep 17 00:00:00 2001 From: Colby Swandale <996377+colby-swandale@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:49:38 +1100 Subject: [PATCH 4/4] Copy .ruby-version in Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 79e4ad2..b66b0e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN apk update && apk --update add \ COPY Gemfile /app/ COPY Gemfile.lock /app/ +COPY .ruby-version /app/ RUN apk --update add \ --virtual build-dependencies \