Skip to content

Commit 8d42d81

Browse files
authored
Merge pull request #6397 from rubyforgood/ruby-3.3.8-upgrade
also upgrade from ruby 3.3.6 to 3.3.8
2 parents c35dbff + a0bb7cc commit 8d42d81

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

.devcontainer/post-create.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
33
# copy the file only if it doesn't already exist
44
cp -n .devcontainer/.env.codespaces .env
55

6-
# If the project's required ruby version changes from 3.3.6, this command
6+
# If the project's required ruby version changes from 3.3.8, this command
77
# will download and compile the correct version, but it will take a long time.
8-
if [ "$RUBY_VERSION" != "3.3.6" ]; then
8+
if [ "$RUBY_VERSION" != "3.3.8" ]; then
99
rvm install $RUBY_VERSION
1010
rvm use $RUBY_VERSION
1111
echo "Ruby $RUBY_VERSION installed"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.3.8

.tool-versions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
ruby 3.3.6
2-
npm 11.0.0
1+
ruby 3.3.8
32
nodejs 22.11.0

Dockerfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
FROM ruby:3.3.6-alpine AS builder
1+
FROM ruby:3.3.8-alpine AS builder
22

33
RUN apk update && apk upgrade && apk add --update --no-cache \
44
build-base \
55
curl-dev \
6+
libffi-dev \
7+
yaml-dev \
8+
linux-headers \
69
postgresql-dev \
710
tzdata
811

@@ -14,19 +17,22 @@ RUN bundle install
1417

1518
### BUILD STEP DONE ###
1619

17-
FROM ruby:3.3.6-alpine
20+
FROM ruby:3.3.8-alpine
1821

1922
ARG RAILS_ROOT=/usr/src/app/
2023

24+
# available: https://pkgs.alpinelinux.org/packages
2125
RUN apk update && apk upgrade && apk add --update --no-cache \
2226
bash \
27+
build-base \
2328
curl \
2429
imagemagick \
30+
nodejs \
31+
npm \
2532
postgresql-client \
2633
tzdata \
27-
vim && rm -rf /var/cache/apk/*
28-
# The ruby alpine image's apk doesn't have the current version of node
29-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs npm
34+
vim \
35+
&& rm -rf /var/cache/apk/*
3036

3137
WORKDIR $RAILS_ROOT
3238

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "3.3.6"
5+
ruby "3.3.8"
66
gem "rails", "~> 7.2"
77

88
gem "after_party" # post-deployment tasks

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ GEM
233233
faraday-retry (1.0.3)
234234
faraday_middleware (1.2.1)
235235
faraday (~> 1.0)
236-
ffi (1.17.1)
237-
ffi (1.17.1-arm64-darwin)
238-
ffi (1.17.1-x86_64-darwin)
239-
ffi (1.17.1-x86_64-linux-gnu)
236+
ffi (1.17.2)
237+
ffi (1.17.2-arm64-darwin)
238+
ffi (1.17.2-x86_64-darwin)
239+
ffi (1.17.2-x86_64-linux-gnu)
240240
filterrific (5.2.7)
241241
flipper (1.3.4)
242242
concurrent-ruby (< 2)
@@ -319,7 +319,7 @@ GEM
319319
marcel (1.0.4)
320320
matrix (0.4.2)
321321
method_source (1.1.0)
322-
mini_magick (5.1.2)
322+
mini_magick (5.2.0)
323323
benchmark
324324
logger
325325
mini_mime (1.1.5)
@@ -735,7 +735,7 @@ DEPENDENCIES
735735
wicked
736736

737737
RUBY VERSION
738-
ruby 3.3.6p108
738+
ruby 3.3.8p144
739739

740740
BUNDLED WITH
741741
2.6.6

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

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

4444
bundixcli = bundix.packages.${system}.default;
4545
in rec {

0 commit comments

Comments
 (0)