Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hyrax 5.0.0.rc2 OD2 #2973

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# yarn lockfile v1


lastUpdateCheck 1635288382639
lastUpdateCheck 1698174086578
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7-alpine3.15 as bundler
FROM ruby:alpine3.18 as bundler

# Necessary for bundler to operate properly
ENV LANG C.UTF-8
Expand All @@ -12,9 +12,9 @@ FROM bundler as dependencies
RUN apk --no-cache update && apk --no-cache upgrade && \
apk add --no-cache alpine-sdk nodejs unzip ghostscript vim yarn \
git sqlite sqlite-dev postgresql-dev libjpeg-turbo-dev libpng-dev \
libtool libgomp libreoffice libressl libressl-dev java-common libc6-compat \
libtool libgomp libreoffice java-common libc6-compat \
curl build-base tzdata zip autoconf automake libtool texinfo \
bash bash-completion java-common openjdk11-jre-headless graphicsmagick \
bash bash-completion java-common openjdk11-jre-headless libressl graphicsmagick \
poppler-utils ffmpeg tesseract-ocr openjpeg-dev openjpeg-tools openjpeg less\
libffi libffi-dev xz gcompat tini tmux libxslt-dev libxml2-dev

Expand Down Expand Up @@ -56,7 +56,7 @@ ARG UID=8083
ARG GID=8083

# Create an app user so our program doesn't run as root.
RUN addgroup -g "$GID" app && adduser -h /data -u "$UID" -G app -D -H app
RUN addgroup -g 8083 app && adduser -h /data -u 8083 -G app -D -H app

FROM dependencies as gems

Expand Down
19 changes: 10 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ end
# TODO: make this a version specification once we get a new release cut
# gem 'hydra-derivatives', git: 'https://github.com/samvera/hydra-derivatives.git'

gem "blacklight_range_limit", "~> 6"
gem 'browse-everything'
# coffee-rails is a requirement for Hyrax or one of its dependencies but hasn't
# been added to either gemspecs
Expand All @@ -18,28 +17,29 @@ gem 'dalli', '~> 3.2.3'
gem 'devise'
gem "edtf", "~> 3.0"
gem 'hydra-role-management'
gem 'hyrax', '3.6.0'
gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master'
gem 'hyrax', '5.0.0.rc2'
gem 'jquery-rails'
gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails'
gem 'sassc-rails'
gem 'chosen-rails'
gem 'pg'
gem 'puma', '~> 5.6'
gem 'rails', '~> 5.2'
gem 'puma'
gem 'rails', '~> 6.1'
gem 'rsolr', '>= 1.0'
gem 'sass-rails', '~> 5.0'
gem 'sass-rails'
gem 'sidekiq', '~> 6.4'
gem 'streamio-ffmpeg'
gem 'stemmify'
gem 'tzinfo-data'
gem 'uglifier', '>= 1.3.0'
gem 'ruby-oembed'
gem 'blacklight_advanced_search', '~> 6.4'
gem 'blacklight_advanced_search'
gem 'blacklight-oembed'
gem 'blacklight_dynamic_sitemap'
gem 'triplestore-adapter', git: 'https://github.com/osulp/triplestore-adapter'
gem 'faraday_middleware', '~> 0.10.0'
gem 'blacklight_iiif_search', '~> 1.0'
gem 'faraday_middleware'
gem 'blacklight_iiif_search'
gem 'blacklight_range_limit'
gem 'rubyzip', '~> 2'
gem 'zip_tricks', '~> 5.3'
gem 'bulkrax', github: 'samvera-labs/bulkrax', ref: 'd9bc39781b9c542a766b9ff2f7a7cce2d736debd' #5.2.1
Expand Down Expand Up @@ -107,3 +107,4 @@ gem "vcr", "~> 5.1"

# INSTALL: Get the new Font Awesome
gem 'font-awesome-sass', '~> 6.4', '>= 6.4.2'
gem 'bootstrap-sass'
Loading