Merge branch 'main' into re-add-multiple-convictions

Author: vertism

.env.example

@@ -42,23 +42,6 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 14.17.5
-
-      - name: Find yarn cache location
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: JS package cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
       - name: Install packages
         run: |
           yarn install --pure-lockfile

.env.test.example

@@ -1 +1 @@
-3.2.3
+3.3.4

.github/workflows/test.yml

@@ -1,59 +1,49 @@
-FROM ruby:3.2.3-alpine as builder
+FROM ruby:3.3.4-alpine as base
+
+WORKDIR /app
+
+# postgresql-client: to run postgres, tzdata: required to set timezone, nodejs: JS runtime
+RUN apk add --no-cache \
+    postgresql-client \
+    tzdata \
+    nodejs
+
+# Ensure latest rubygems is installed
+RUN gem update --system
+
+FROM base as builder
 
 # build dependencies:
 RUN apk add --no-cache \
+    ruby-dev \
     build-base \
     postgresql-dev \
-    tzdata \
     yarn
 
-WORKDIR /app
-
-COPY Gemfile* .ruby-version ./
+COPY Gemfile* .ruby-version package.json yarn.lock ./
 
-RUN gem install bundler -v 2.4.19
 RUN bundle config deployment true && \
     bundle config without development test && \
-    bundle install --jobs 4 --retry 3
-
-# Install node packages defined in package.json
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --check-files
+    bundle install --jobs 4 --retry 3 && \
+    yarn install --frozen-lockfile
 
 # Copy all files to /app
 COPY . .
 
-# The following are ENV variables that need to be present by the time
-# the assets pipeline run, but doesn't matter their value.
-#
-ENV EXTERNAL_URL            replace_this_at_build_time
-ENV SECRET_KEY_BASE         replace_this_at_build_time
-ENV GOVUK_NOTIFY_API_KEY    replace_this_at_build_time
-
-ENV RAILS_ENV production
-RUN bundle exec rake assets:precompile
+RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 \
+    bundle exec rails assets:precompile
 
 # Copy fonts and images (without digest) along with the digested ones,
 # as there are some hardcoded references in the `govuk-frontend` files
 # that will not be able to use the rails digest mechanism.
 RUN cp -r node_modules/govuk-frontend/dist/govuk/assets/. public/assets/
 
-# tidy up installation
-RUN rm -rf log/* tmp/* /tmp && \
-    rm -rf /usr/local/bundle/cache && \
-    find /usr/local/bundle/gems -name "*.c" -delete && \
-    find /usr/local/bundle/gems -name "*.h" -delete && \
-    find /usr/local/bundle/gems -name "*.o" -delete && \
-    find /usr/local/bundle/gems -name "*.html" -delete
+# Cleanup to save space in the production image
+RUN rm -rf node_modules log/* tmp/* /tmp && \
+    rm -rf /usr/local/bundle/cache
 
 # Build runtime image
-FROM ruby:3.2.3-alpine
-
-# The application runs from /app
-WORKDIR /app
-
-# libpq: required to run postgres, tzdata: required to set timezone, nodejs: JS runtime
-RUN apk add --no-cache libpq tzdata nodejs
+FROM base
 
 # add non-root user and group with alpine first available uid, 1000
 RUN addgroup -g 1000 -S appgroup && \
@@ -65,21 +55,14 @@ COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
 # Create log and tmp
 RUN mkdir -p log tmp
-RUN chown -R appuser:appgroup db log tmp
+RUN chown -R appuser:appgroup ./*
 
-ARG APP_BUILD_DATE
-ENV APP_BUILD_DATE ${APP_BUILD_DATE}
+# Set user
+USER 1000
 
+ARG APP_BUILD_DATE
 ARG APP_BUILD_TAG
-ENV APP_BUILD_TAG ${APP_BUILD_TAG}
-
 ARG APP_GIT_COMMIT
+ENV APP_BUILD_DATE ${APP_BUILD_DATE}
+ENV APP_BUILD_TAG ${APP_BUILD_TAG}
 ENV APP_GIT_COMMIT ${APP_GIT_COMMIT}
-
-ENV APPUID 1000
-USER $APPUID
-
-ENV PUMA_PORT 3000
-EXPOSE $PUMA_PORT
-
-ENTRYPOINT ["./run.sh"]

.ruby-version

@@ -3,8 +3,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby File.read(".ruby-version").strip
 
-# Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", ">= 1.1.0", require: false
 gem "govuk-components", "~> 5.4"
 gem "govuk_design_system_formbuilder"
 gem "jquery-rails"
@@ -40,7 +38,7 @@ end
 group :test do
   gem "brakeman"
   gem "capybara"
-  gem "cucumber", "< 9.0.0"
+  gem "cucumber", "< 10.0.0"
   gem "cucumber-rails", require: false
   gem "rails-controller-testing"
   gem "rubocop-govuk", require: false