Merge pull request #6409 from NHSDigital/next

Version 7.5.0

Author: thomasleese

.ruby-version

@@ -1 +1 @@
-ruby-4.0.1
+ruby-4.0.2

.tool-versions

@@ -5,6 +5,6 @@ nodejs     22.15.0
 pkl        0.31.0
 postgres   17.2
 redis      8.2.1
-ruby       4.0.1
+ruby       4.0.2
 shellcheck 0.11.0
 yamllint   1.38.0

Dockerfile

@@ -2,7 +2,7 @@
 # check=error=true
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=4.0.1
+ARG RUBY_VERSION=4.0.2
 ARG BUNDLE_WITHOUT="development:test"
 ARG RAILS_ENV="production"
 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
@@ -23,7 +23,8 @@ ENV RAILS_ENV="$RAILS_ENV" \
     NODE_ENV="production" \
     BUNDLE_WITHOUT="$BUNDLE_WITHOUT" \
     BUNDLE_DEPLOYMENT="1" \
-    BUNDLE_PATH="/usr/local/bundle"
+    BUNDLE_PATH="/usr/local/bundle" \
+    XDG_STATE_HOME="/rails/tmp"
 
 # Throw-away build stage to reduce size of final image
 FROM base AS build
@@ -77,11 +78,6 @@ FROM base
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
 COPY --from=build /rails /rails
 
-# Run and own only the runtime files as a non-root user for security
-RUN groupadd --system --gid 1000 rails && \
-    useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \
-    chown -R rails:rails db log storage tmp
-
 # Generate and install self-signed TLS certificates at build time.
 RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y sudo && \
@@ -90,6 +86,11 @@ RUN apt-get update -qq && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
+# Run and own only the runtime files as a non-root user for security
+RUN groupadd --system --gid 1000 rails && \
+    useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \
+    chown -R rails:rails db log storage tmp
+
 USER 1000:1000
 
 # Entrypoint prepares the database.

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby file: ".ruby-version"
-gem "rails", "8.1.2"
+gem "rails", "8.1.2.1"
 
 # Framework gems
 gem "bootsnap", require: false