From 9abad7611cb35d1dc72e4ffb38d05b30a7123a36 Mon Sep 17 00:00:00 2001 From: Joel Sugarman Date: Mon, 30 Dec 2024 12:59:16 +0000 Subject: [PATCH 1/2] AP-5659: Bump ruby 3.3.6 to 3.4.1 --- .circleci/config.yml | 8 ++++---- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22ebd2da..d09362b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,13 +16,13 @@ executors: TZ: Europe/London linting-executor: docker: - - image: cimg/ruby:3.3.6-node + - image: cimg/ruby:3.4.1-node environment: RAILS_ENV: test TZ: "Europe/London" test-executor: docker: - - image: cimg/ruby:3.3.6-node + - image: cimg/ruby:3.4.1-node environment: RAILS_ENV: test PGHOST: localhost @@ -47,7 +47,7 @@ references: restore_gems_cache: &restore_gems_cache restore_cache: keys: - - laa-hmrc-interface-{{ checksum "Gemfile.lock" }}-v3.3.6 + - laa-hmrc-interface-{{ checksum "Gemfile.lock" }}-v3.4.1 install_gems: &install_gems run: name: Install ruby gems @@ -56,7 +56,7 @@ references: bundle install --path=vendor/bundle --jobs=4 && bundle clean save_gems_cache: &save_gems_cache save_cache: - key: laa-hmrc-interface-{{ checksum "Gemfile.lock" }}-v3.3.6 + key: laa-hmrc-interface-{{ checksum "Gemfile.lock" }}-v3.4.1 paths: - vendor/bundle install_packages_for_testing: &install_packages_for_testing diff --git a/.ruby-version b/.ruby-version index e391e180..408069ae 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.3.6 +ruby-3.4.1 diff --git a/Dockerfile b/Dockerfile index 5b1142d9..9ea186ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.6-alpine3.21 +FROM ruby:3.4.1-alpine3.21 MAINTAINER Apply for legal aid team diff --git a/Gemfile.lock b/Gemfile.lock index f26358c6..de10f4a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -470,7 +470,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.3.6p108 + ruby 3.4.1p0 BUNDLED WITH 2.6.2 From 268860d96b1b69168e73700abd148f84b77f1299 Mon Sep 17 00:00:00 2001 From: Joel Sugarman Date: Mon, 30 Dec 2024 13:02:18 +0000 Subject: [PATCH 2/2] Chore: Replace deprecated MAINTAINER with LABEL in docker file --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ea186ce..60bb5c27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ FROM ruby:3.4.1-alpine3.21 -MAINTAINER Apply for legal aid team +LABEL org.opencontainers.image.vendor="Ministry of Justice" \ + org.opencontainers.image.authors="Apply for civil legal aid team (apply-for-civil-legal-aid@digital.justice.gov.uk)" \ + org.opencontainers.image.title="LAA HMRC Interface Service API" \ + org.opencontainers.image.description="Wrapper API for accessing HRMC API for LAA use cases" \ + org.opencontainers.image.url="https://github.com/ministryofjustice/laa-hmrc-interface-service-api" ENV RAILS_ENV production