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
4 changes: 2 additions & 2 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
# copy the file only if it doesn't already exist
cp -n .devcontainer/.env.codespaces .env

# If the project's required ruby version changes from 3.3.6, this command
# If the project's required ruby version changes from 3.3.8, this command
# will download and compile the correct version, but it will take a long time.
if [ "$RUBY_VERSION" != "3.3.6" ]; then
if [ "$RUBY_VERSION" != "3.3.8" ]; then
rvm install $RUBY_VERSION
rvm use $RUBY_VERSION
echo "Ruby $RUBY_VERSION installed"
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.3.8
3 changes: 1 addition & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ruby 3.3.6
npm 11.0.0
ruby 3.3.8
nodejs 22.11.0
16 changes: 11 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM ruby:3.3.6-alpine AS builder
FROM ruby:3.3.8-alpine AS builder

RUN apk update && apk upgrade && apk add --update --no-cache \
build-base \
curl-dev \
libffi-dev \
yaml-dev \
linux-headers \
postgresql-dev \
tzdata

Expand All @@ -14,19 +17,22 @@ RUN bundle install

### BUILD STEP DONE ###

FROM ruby:3.3.6-alpine
FROM ruby:3.3.8-alpine

ARG RAILS_ROOT=/usr/src/app/

# available: https://pkgs.alpinelinux.org/packages
RUN apk update && apk upgrade && apk add --update --no-cache \
bash \
build-base \
curl \
imagemagick \
nodejs \
npm \
postgresql-client \
tzdata \
vim && rm -rf /var/cache/apk/*
# The ruby alpine image's apk doesn't have the current version of node
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs npm
vim \
&& rm -rf /var/cache/apk/*

WORKDIR $RAILS_ROOT

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "3.3.6"
ruby "3.3.8"
gem "rails", "~> 7.2"

gem "after_party" # post-deployment tasks
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
ffi (1.17.1)
ffi (1.17.1-arm64-darwin)
ffi (1.17.1-x86_64-darwin)
ffi (1.17.1-x86_64-linux-gnu)
ffi (1.17.2)
ffi (1.17.2-arm64-darwin)
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
filterrific (5.2.7)
flipper (1.3.4)
concurrent-ruby (< 2)
Expand Down Expand Up @@ -319,7 +319,7 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
method_source (1.1.0)
mini_magick (5.1.2)
mini_magick (5.2.0)
benchmark
logger
mini_mime (1.1.5)
Expand Down Expand Up @@ -735,7 +735,7 @@ DEPENDENCIES
wicked

RUBY VERSION
ruby 3.3.6p108
ruby 3.3.8p144

BUNDLED WITH
2.6.6
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

gemConfig = { };
# See available versions here: https://github.com/bobvanderlinden/nixpkgs-ruby/blob/master/ruby/versions.json
ruby = pkgs."ruby-3.3.6";
ruby = pkgs."ruby-3.3.8";

bundixcli = bundix.packages.${system}.default;
in rec {
Expand Down