Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/development/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.5 AS cartafact_base
FROM ruby:3.4.9 AS cartafact_base


ENV HOME /cartafact
Expand Down
2 changes: 1 addition & 1 deletion .docker/production/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
### app config ###
########################

FROM ruby:3.2.5 AS app
FROM ruby:3.4.9 AS app

ENV HOME /cartafact

Expand Down
8 changes: 5 additions & 3 deletions .docker/production/Dockerfile.gha
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
############################################

# Taken from .ruby-version
ARG RUBY_VERSION=3.2.5
ARG RUBY_VERSION=3.4.9
FROM ruby:$RUBY_VERSION-slim-bookworm AS base
LABEL author="DCHBX"

ARG DEBIAN_FRONTEND=noninteractive

# Taken from Gemfile.lock
ARG BUNDLER_VERSION=2.4.19
ARG BUNDLER_VERSION=2.6.9
ENV BUNDLER_VERSION=$BUNDLER_VERSION

ARG NODE_MAJOR=20
Expand Down Expand Up @@ -44,6 +44,8 @@ RUN apt-get update \
unzip \
zip \
zlib1g \
libyaml-dev \
pkg-config \
libjemalloc2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
Expand All @@ -64,7 +66,7 @@ ENV HOME=/cartafact
ENV PATH=$HOME/bin:$BUNDLE_BIN:$GEM_HOME/gems/bin:$PATH

# rubygems-update > 3.4.22 requires ruby >= 3.0.0
RUN gem update --system 3.4.22\
RUN gem update --system \
&& rm -f /usr/local/bin/ruby/gems/*/specifications/default/bundler-*.gemspec \
&& gem install bundler -v $BUNDLER_VERSION

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
services:
mongo:
image: mongo:4.2
image: mongo:5.0
ports:
- 27017:27017
options: >-
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
- name: Launch MongoDB
uses: wbari/start-mongoDB@v0.2
with:
mongoDBVersion: 3.6
- name: Set up Ruby 3.2.5
mongoDBVersion: 5.0
- name: Set up Ruby 3.4.9
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.5
ruby-version: 3.4.9
- name: Cache Gems
uses: actions/cache@v4
with:
Expand All @@ -35,4 +35,4 @@ jobs:
bundle exec rspec
- name: Run Rubocop
run: |
bundle exec rubocop
bundle exec rubocop
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.2.5
3.4.9
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.5'
ruby '3.4.9'

gem 'rails', '~> 7.2.0'
gem 'rails', '~> 8.1'

gem 'mongoid', '~> 8.1.5'
gem 'mongoid', '~> 9.0'
# Use Puma as the app server
gem 'puma', '~> 6.0'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand All @@ -30,7 +30,7 @@ gem "aws-sdk-s3", "~> 1.14"
# Settings, validation and dependency injection
# TODO: Use tagged release for resource_registry instead of branch
gem 'resource_registry', git: 'https://github.com/ideacrew/resource_registry.git', tag: 'v0.10.1'
gem 'fast_jsonapi'
gem 'jsonapi-serializer'

gem 'shrine-mongoid', '~> 1.0'

Expand All @@ -47,7 +47,7 @@ gem 'dry-container', '~> 0.7'
gem 'dry-auto_inject', '~> 0.6'
gem 'dry-transaction', '~> 0.13'
gem 'dry-initializer', '~> 3.0'
gem 'jwt', '~> 2.2.1'
gem 'jwt', '~> 2.9'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand All @@ -56,8 +56,8 @@ group :development, :test do
gem 'shoulda-matchers'
gem 'yard'
gem 'climate_control'
gem 'factory_bot_rails', '~> 4.11'
gem 'database_cleaner', '~> 1.7'
gem 'factory_bot_rails', '~> 6.4'
gem 'database_cleaner-mongoid', '~> 2.0'
gem 'pry-byebug'
end

Expand Down
Loading
Loading