Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/blacklight-8.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cdoyle-temple authored Jan 6, 2025
2 parents b8a052c + 9a398d1 commit f4c297b
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 120 deletions.
16 changes: 8 additions & 8 deletions .docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ ARG SECRET_KEY_BASE

# gcompat is required for m1 build.
RUN apk add -U --no-cache \
bash=5.2.26-r0 \
bash=5.2.37-r0 \
gcompat=1.1.0-r4 \
libxslt=1.1.39-r1 \
libxslt=1.1.42-r1 \
postgresql16-client=16.6-r0 \
shared-mime-info=2.4-r0 \
tzdata=2024b-r0 && \
shared-mime-info=2.4-r2 \
tzdata=2024b-r1 && \
apk add -U --no-cache --virtual build-dependencies \
build-base=0.5-r3 \
git=2.45.2-r0 \
libxslt-dev=1.1.39-r1 \
git=2.47.1-r0 \
libxslt-dev=1.1.42-r1 \
postgresql16-dev=16.6-r0 \
nodejs=20.15.1-r0 \
yarn=1.22.22-r0 && \
nodejs=22.11.0-r1 \
yarn=1.22.22-r1 && \
bundle config set --local without "development test" && \
bundle install --jobs=8 && \
find "$GEM_HOME" -name yarn.lock -exec rm "{}" \; && \
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem "rails", "7.2.2"
gem "rails", "7.2.2.1"

gem "base64", "0.2.0"
gem "blacklight", "~> 8.7.0"
Expand All @@ -14,7 +14,7 @@ gem "cssbundling-rails", "~> 1.4"
gem "dotenv-rails"
gem "fieldhand"
gem "funnel_cake_index", github: "tulibraries/funnel_cake_index"
gem "importmap-rails", "~> 2.0"
gem "importmap-rails", "~> 2.1"
gem "jquery-rails"
gem "okcomputer"
gem "pg"
Expand Down
Loading

0 comments on commit f4c297b

Please sign in to comment.