diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2b357e1f..c64abec3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: ECR_REGISTRY: '${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com' IDP_WORKER_IMAGE_TAG: 'main' - PIVCAC_CI_SHA: 'sha256:87767eb8daa6703c247d5a4baa5e19eddc58bc051f01070903f24d9f8a6c9267' + PIVCAC_CI_SHA: 'sha256:831676006259d22aee1e7fc36331bb90ba8bbca90aee8efdb8bfb0299b4f9635' CI: 'true' default: diff --git a/.ruby-version b/.ruby-version index 9f55b2ccb..a3ec5a4bd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0 +3.2 diff --git a/Gemfile b/Gemfile index 96c5d834e..8c040e848 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,14 @@ source 'https://rubygems.org' git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } -ruby '~> 3.0' +ruby '~> 3.2' gem 'rails', '~> 7.0.7' gem 'activerecord-import', '>= 1.0.2' gem 'aws-sdk-s3' gem 'bloomfilter-rb' -gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v3.4.1' +gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v3.4.2' gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.0' gem 'mini_cache' gem 'newrelic_rpm', '~> 8.0' diff --git a/Gemfile.lock b/Gemfile.lock index d97fbd10f..e3a9d952c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/18F/identity-hostdata.git - revision: 25a7e98919b1eb0d61dbcce314807a412aff62ad - tag: v3.4.1 + revision: 9e2e0441cd93307cbfc5d5b8d4b3b7b4219394fb + tag: v3.4.2 specs: - identity-hostdata (3.4.1) + identity-hostdata (3.4.2) activesupport (>= 6.1, < 8) aws-sdk-s3 (~> 1.8) @@ -153,7 +153,7 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - fakefs (1.2.2) + fakefs (2.5.0) ffi (1.15.5) formatador (0.2.5) globalid (1.1.0) @@ -227,13 +227,13 @@ GEM parallel (1.22.1) parser (3.2.2.0) ast (~> 2.4.1) - pg (1.2.3) - pry (0.13.1) + pg (1.5.3) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) + pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) @@ -290,24 +290,24 @@ GEM redacted_struct (1.1.0) redis (4.2.4) regexp_parser (2.7.0) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rgl (0.5.6) lazy_priority_queue (~> 0.1.0) stream (~> 0.5.2) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.12.0) rspec-rails (4.0.1) actionpack (>= 4.2) activesupport (>= 4.2) @@ -316,7 +316,7 @@ GEM rspec-expectations (~> 3.9) rspec-mocks (~> 3.9) rspec-support (~> 3.9) - rspec-support (3.10.3) + rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.1) @@ -419,7 +419,7 @@ DEPENDENCIES zonebie RUBY VERSION - ruby 3.0.3p157 + ruby 3.2.2p53 BUNDLED WITH - 2.2.33 + 2.4.19 diff --git a/k8.Dockerfile b/k8.Dockerfile index 813923d2f..39fd1730c 100644 --- a/k8.Dockerfile +++ b/k8.Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0.5-slim +FROM ruby:3.2.2-slim-bullseye SHELL ["/bin/bash", "-c"]