Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ruby v3.2.2 #2543

Merged
merged 3 commits into from
Nov 2, 2023
Merged

Ruby v3.2.2 #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c62b37
Bump ruby version -> v3.2.2
dannymidnight Nov 1, 2023
7bd0dad
Optimise docker layers to handle asset changes
dannymidnight Nov 2, 2023
44dbd31
Bump recarpet gem
dannymidnight Nov 2, 2023
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 .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.2.2
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/ruby:3.1.4-slim-bookworm@sha256:6c5ebf029d658391fb9243b37e970f84100eab678e2e6e77f316f847e02d5ed9
FROM public.ecr.aws/docker/library/ruby:3.2.2-slim-bookworm@sha256:17de1131ceb018ab30cbb76505559baa49a4c1b125e03c90dd10220bf863783c

ARG RAILS_ENV
ARG DD_RUM_VERSION="unknown"
Expand Down Expand Up @@ -50,12 +50,12 @@ RUN echo "--- :bundler: Installing ruby gems" \
# Install tool for generating static site
RUN curl -sf https://gobinaries.com/tj/staticgen/cmd/staticgen | sh

# Add the app
COPY . /app

RUN echo "--- :npm: Installing node dependencies"
COPY package.json yarn.lock ./
RUN yarn

COPY . /app/

# Compile assets
RUN if [ "$RAILS_ENV" = "production" ]; then \
echo "--- Precompiling assets" \
Expand Down
5 changes: 2 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ GEM
rake (>= 12.2)
thor (~> 1.0)
rake (13.0.6)
redcarpet (3.5.1)
redcarpet (3.6.0)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed a warning coming through so ended up also bumping this gem for latest patch.

regexp_parser (2.1.1)
request_store (1.5.0)
rack (>= 1.4)
Expand Down Expand Up @@ -152,7 +152,6 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
websocket (1.2.9)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.11)
Expand Down Expand Up @@ -190,7 +189,7 @@ DEPENDENCIES
web-console

RUBY VERSION
ruby 3.1.4p223
ruby 3.2.2p53

BUNDLED WITH
2.4.7