Bump ruby from 2.7.6 to 3.2.2 (#399)

* Update ruby from 2.7.6 to 3.2.2 * Bump base ruby image version to 3.2.2 * Tweak dashboard startup * Update skaffold.yaml to Skaffold v2 schema * Update CI config
appvia · Nov 11, 2024 · e8f0d5a · e8f0d5a
1 parent 6516940
commit e8f0d5a
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 103 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,30 +2,27 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@1.2.0
+  ruby: circleci/ruby@2.3.0
 
 executors:
   skaffold:
     docker:
-      - image: gcr.io/k8s-skaffold/skaffold:latest
+      - image: gcr.io/k8s-skaffold/skaffold:v2.13.2
 
 jobs:
   test:
-    parallelism: 1
     docker:
-      - image: ruby:2.7.6-alpine3.14
-        environment:
-          BUNDLE_JOBS: 10
-          BUNDLE_RETRY: 5
-          BUNDLE_PATH: vendor/bundle
-          KRANE_ENV: test
+      - image: cimg/ruby:3.2.2-node
+    parallelism: 3
+    environment:
+      BUNDLE_JOBS: 10
+      BUNDLE_RETRY: 5
+      BUNDLE_PATH: vendor/bundle
+      KRANE_ENV: test
     steps:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-      - run:
-          name: Install system deps
-          command: apk add --update --no-cache git bash curl make gcc libc-dev tzdata g++ npm
       - run:
           name: Which bundler?
           command: bundle -v
@@ -47,6 +44,7 @@ jobs:
           name: Build artifacts w/ Skaffold
           command: |
             mkdir -p build
+            skaffold config set --global collect-metrics false
             skaffold build -p build-no-push --file-output build/${CIRCLE_SHA1}.json
       - persist_to_workspace:
           root: ~/project
@@ -64,6 +62,7 @@ jobs:
           command: |
             mkdir -p build
             docker login quay.io --username $DOCKER_USER --password $DOCKER_PASSWORD
+            skaffold config set --global collect-metrics false
             skaffold build -p build-and-push --file-output build/${CIRCLE_SHA1}.json
             # re-tag :latest
             skaffold_tag=$(cat build/${CIRCLE_SHA1}.json | jq -r '.builds[0].tag | split("@")[0]')
@@ -105,6 +104,7 @@ jobs:
             export SKAFFOLD_NAMESPACE=<<parameters.skaffold_namespace>>
 
             # Deploy with Skaffold - refers to artefacts built in previous step
+            skaffold config set --global collect-metrics false
             skaffold deploy --build-artifacts build/${CIRCLE_SHA1}.json
 
 workflows:

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.6
+3.2.2
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 
 ##############################################################
 # Stage: builder
-FROM ruby:2.7.6-alpine3.16 AS builder
+FROM ruby:3.2.2-alpine3.16 AS builder
 
 WORKDIR /app
 
@@ -47,7 +47,7 @@ RUN cd dashboard && jekyll build --trace -s ./src/html -d ./tmp && cp ./tmp/*.ht
 
 ##############################################################
 # Stage: final
-FROM ruby:2.7.6-alpine3.16
+FROM ruby:3.2.2-alpine3.16
 
 LABEL org="Appvia Ltd"
 LABEL website="appvia.io"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,53 +18,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.1)
-      activesupport (= 7.0.7.1)
-    activesupport (7.0.7.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activesupport (8.0.0)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
-    attr_required (1.0.1)
+    attr_required (1.0.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     byebug (11.1.3)
     colorator (1.1.0)
     colorize (1.1.0)
-    commander (4.6.0)
-      highline (~> 2.0.0)
+    commander (5.0.0)
+      highline (~> 3.0.0)
     concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    date (3.4.0)
     diff-lcs (1.5.1)
     docile (1.4.1)
     domain_name (0.6.20240107)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     email_validator (2.2.4)
       activemodel
     eventmachine (1.2.7)
     facets (3.1.0)
-    factory_bot (6.4.5)
+    factory_bot (6.5.0)
       activesupport (>= 5.0.0)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
+    faraday-net_http (3.3.0)
+      net-http
     ffi (1.17.0)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
     forwardable-extended (2.6.0)
-    google-protobuf (3.25.5)
+    google-protobuf (4.28.3)
+      bigdecimal
+      rake (>= 13)
     hashie (5.0.0)
-    highline (2.0.3)
+    highline (3.0.1)
     http (5.2.0)
       addressable (~> 2.8)
       base64 (~> 0.1)
@@ -99,7 +115,7 @@ GEM
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     json (2.8.1)
-    json-jwt (1.16.6)
+    json-jwt (1.16.7)
       activesupport (>= 4.2)
       aes_key_wrap
       base64
@@ -126,17 +142,31 @@ GEM
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     logger (1.6.1)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     memoist (0.16.2)
     mercenary (0.4.0)
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1105)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     minitest (5.25.1)
     multi_json (1.15.0)
+    net-http (0.5.0)
+      uri
+    net-imap (0.5.1)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
     netrc (0.11.0)
     openid_connect (2.3.1)
       activemodel
@@ -162,10 +192,10 @@ GEM
     profile (0.4.0)
     psych (5.2.0)
       stringio
-    public_suffix (5.1.1)
+    public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.0.9.1)
-    rack-oauth2 (2.2.0)
+    rack (3.1.8)
+    rack-oauth2 (2.2.1)
       activesupport
       attr_required
       faraday (~> 2.0)
@@ -181,7 +211,7 @@ GEM
       psych (>= 4.0.0)
     recursive-open-struct (1.3.1)
       ostruct
-    redis (4.4.0)
+    redis (4.8.1)
     redisgraph (2.0.3)
       redis (~> 4)
     regexp_parser (2.9.2)
@@ -219,22 +249,22 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.34.1)
       parser (>= 3.3.1.0)
-    ruby-prof (1.6.3)
+    ruby-prof (1.7.1)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.63.6)
-      google-protobuf (~> 3.23)
-      rake (>= 13.0.0)
+    sass-embedded (1.80.6)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    securerandom (0.3.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     slack-notifier (2.4.0)
     stringio (3.1.2)
-    swd (2.0.2)
+    swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
@@ -243,13 +273,15 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     test-unit (3.6.2)
       power_assert
+    timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
+    uri (1.0.1)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    webfinger (2.1.2)
+    webfinger (2.1.3)
       activesupport
       faraday (~> 2.0)
       faraday-follow_redirects
@@ -274,4 +306,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.2.28
+   2.4.10
diff --git a/dashboard/dashboard.js b/dashboard/dashboard.js
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const express = require('express')
-const serveStatic = require('serve-static')
+import express from 'express';
+import serveStatic from 'serve-static';
 
 const app = express()
 const port = process.env.port || 8000

diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json