diff --git a/.circleci/config.yml b/.circleci/config.yml index 93eb88f0..028e8d85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,13 @@ version: 2.1 orbs: - docker: circleci/docker@1.5.0 - browser-tools: circleci/browser-tools@1.4.8 + docker: circleci/docker@2.6.0 + browser-tools: circleci/browser-tools@1.4.8 jobs: release: docker: - - image: harbor.k8s.libraries.psu.edu/library/ci-utils:$CI_UTILS_IMAGE_TAG + - image: harbor.k8s.libraries.psu.edu/library/ci-utils:v4.0.4 environment: REGISTRY_HOST: harbor.k8s.libraries.psu.edu REGISTRY_REPO: library/psulib_blacklight @@ -26,11 +26,11 @@ jobs: publish: docker: - - image: harbor.k8s.libraries.psu.edu/library/ci-utils:$CI_UTILS_IMAGE_TAG + - image: harbor.k8s.libraries.psu.edu/library/ci-utils:v4.0.4 user: root steps: - setup_remote_docker: - version: docker24 + version: default docker_layer_caching: true - checkout - docker/check: @@ -38,6 +38,7 @@ jobs: - docker/build: image: library/psulib_blacklight registry: harbor.k8s.libraries.psu.edu + use-buildkit: true extra_build_args: "--target production" - docker/push: digest-path: /tmp/digest.txt @@ -48,7 +49,7 @@ jobs: echo "Digest is: $( 1.18' -gem 'puma', '~> 6' +gem 'puma', '~> 6.5' gem 'rack-mini-profiler' gem 'rails', '~> 7.1.4.1' gem 'rsolr', '>= 2.5' diff --git a/Gemfile.lock b/Gemfile.lock index 0985fa44..d5717581 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -318,7 +318,7 @@ GEM psych (5.2.0) stringio public_suffix (5.0.5) - puma (6.4.3) + puma (6.5.0) nio4r (~> 2.0) racc (1.8.1) rack (3.1.8) @@ -566,7 +566,7 @@ DEPENDENCIES niftany (~> 0.10) okcomputer (~> 1.18) pry-byebug - puma (~> 6) + puma (~> 6.5) rack-mini-profiler rails (~> 7.1.4.1) rails-controller-testing diff --git a/README.md b/README.md index 4afedd26..a30f77aa 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The Penn State University Libraries' catalog. Built on Blacklight, using Traject | Software | Version | |----------|------| -| `ruby` | 3.1.2 | +| `ruby` | 3.1.6 | | `rails` | 6.1.7 | | `solr` | 8.11.2 |