Merge branch 'main' into add-agents-md

Author: adrian-rpf

.circleci/config.yml

@@ -1,7 +1,7 @@
 jobs:
   rubocop:
     docker:
-      - image: "cimg/ruby:3.2"
+      - image: "cimg/ruby:3.4"
     steps:
       - checkout
       - ruby/install-deps
@@ -11,7 +11,7 @@ jobs:
 
   test:
     docker:
-      - image: "cimg/ruby:3.2-browsers"
+      - image: "cimg/ruby:3.4-browsers"
       - image: "circleci/postgres:12.0-alpine-ram"
         environment:
           POSTGRES_DB: choco_cake_test

.ruby-version

@@ -1 +1 @@
-ruby 3.2.3
+ruby 3.4.8

.tool-versions

@@ -1,4 +1,4 @@
-FROM ruby:3.2-slim-bullseye AS base
+FROM ruby:3.4.8-slim-trixie AS base
 RUN gem install bundler \
   && apt-get update \
   && apt-get upgrade --yes \
@@ -7,7 +7,7 @@ RUN gem install bundler \
   curl gnupg graphviz nodejs \
   && mkdir -p /usr/share/keyrings \
   && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-archive-keyring.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+  && echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] https://apt.postgresql.org/pub/repos/apt trixie-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
   && apt-get update \
   && apt-get install --yes --no-install-recommends postgresql-client-17 \
   && rm -rf /var/lib/apt/lists/* /var/lib/apt/archives/*.deb
@@ -20,11 +20,12 @@ WORKDIR /app
 RUN apt-get update \
   && apt-get install --yes --no-install-recommends \
   build-essential libpq-dev libxml2-dev libxslt1-dev git libyaml-dev \
-  firefox-esr python2-dev \
+  firefox-esr \
   && rm -rf /var/lib/apt/lists/* /var/lib/apt/archives/*.deb
-COPY Gemfile Gemfile.lock /app/
+COPY Gemfile Gemfile.lock .tool-versions /app/
+RUN bundle config set bin '/usr/local/bundle/bin'
 RUN bundle install --jobs 4 \
-  && bundle binstubs --all --path /usr/local/bundle/bin \
+  && bundle binstubs --all \
   && bundle binstubs bundler --force
 
 # Dev container image
@@ -44,8 +45,7 @@ FROM base AS app
 WORKDIR /app
 COPY . /app
 COPY --from=builder /usr/local/bundle /usr/local/bundle
-COPY --from=builder /node_modules /node_modules
-COPY --from=builder Gemfile Gemfile.lock package.json yarn.lock .yarnrc /app/
+COPY --from=builder /app/Gemfile /app/Gemfile.lock /app
 CMD ["rails", "server", "-b", "0.0.0.0"]
 EXPOSE 3009
 

Dockerfile

@@ -3,17 +3,21 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '~> 3.2.0'
+ruby file: '.tool-versions'
 
 gem 'administrate', '~> 0.20.1'
 gem 'administrate-field-active_storage'
 gem 'aws-sdk-s3', require: false
+gem 'base64', '~> 0.3'
 gem 'bootsnap', require: false
 gem 'cancancan', '~> 3.3'
 gem 'countries'
+gem 'csv', '~> 3.3'
 gem 'email_validator'
 gem 'faker'
 gem 'faraday'
+gem 'flipper', '~> 1.3'
+gem 'flipper-active_record', '~> 1.3'
 gem 'github_webhook', '~> 1.4'
 gem 'globalid'
 gem 'good_job', '~> 4.3'
@@ -32,10 +36,9 @@ gem 'open-uri'
 gem 'paper_trail'
 gem 'pg', '~> 1.1'
 gem 'postmark-rails'
-gem 'puma', '~> 6'
+gem 'puma', '~> 7.2'
 gem 'rack-cors'
 gem 'rails', '~> 7.1'
-gem 'scout_apm'
 gem 'sentry-rails'
 gem 'statesman'
 
@@ -64,7 +67,7 @@ end
 group :development do
   gem 'rails-erd'
   gem 'ruby-lsp', require: false
-  gem 'ruby-lsp-rspec', '~> 0.1.27', require: false
+  gem 'ruby-lsp-rspec', '~> 0.1.28', require: false
 end
 
 group :test do
@@ -76,3 +79,5 @@ group :test do
   gem 'webdrivers'
   gem 'webmock'
 end
+
+gem 'flipper-ui', '~> 1.3'