Skip to content

Commit

Permalink
HYC 1854 - Gemfile and Rubygems Modifications (#1077)
Browse files Browse the repository at this point in the history
* gemfile update

* changing rubygems-update version to prevent resolution to 3.5

* reverting hyrax branch change

* reverting hyrax branch

* changed update_rubygems specifications to match start-app script

* commit reference update
  • Loading branch information
davidcam-src authored Feb 20, 2024
1 parent 7516058 commit fd73fcf
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
44 changes: 22 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GIT

GIT
remote: https://github.com/UNC-Libraries/hyrax.git
revision: 6127e4878a833f807e9b884899294a708be226e0
revision: 6ea7c7baead5ef10285fe42b380cb7a092667f01
branch: unc-hyrax-4-development
specs:
hyrax (4.0.0)
Expand Down Expand Up @@ -170,17 +170,18 @@ GEM
awesome_nested_set (3.6.0)
activerecord (>= 4.0.0, < 7.2)
aws-eventstream (1.3.0)
aws-partitions (1.865.0)
aws-sdk-core (3.190.0)
aws-partitions (1.893.0)
aws-sdk-core (3.191.2)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
base64
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.74.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sdk-kms (1.77.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.141.0)
aws-sdk-core (~> 3, >= 3.189.0)
aws-sdk-s3 (1.143.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
Expand Down Expand Up @@ -416,20 +417,19 @@ GEM
geocoder (1.8.2)
globalid (1.2.1)
activesupport (>= 6.1)
google-apis-core (0.11.2)
google-apis-core (0.13.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
googleauth (~> 1.9)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-drive_v3 (0.46.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-env (2.1.0)
google-apis-drive_v3 (0.48.0)
google-apis-core (>= 0.12.0, < 2.a)
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
googleauth (1.9.1)
googleauth (1.11.0)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
Expand Down Expand Up @@ -512,7 +512,7 @@ GEM
ice_nine (0.11.2)
iiif-image-api (0.2.0)
activesupport
iiif_manifest (1.3.1)
iiif_manifest (1.4.0)
activesupport (>= 4)
iso8601 (0.9.1)
jbuilder (2.11.5)
Expand All @@ -537,7 +537,8 @@ GEM
rdf (~> 3.1)
json-schema (4.1.1)
addressable (>= 2.8)
jwt (2.7.1)
jwt (2.8.0)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -625,9 +626,9 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1205)
mime-types-data (3.2024.0206)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_racer (0.2.15)
Expand All @@ -636,7 +637,7 @@ GEM
minitest (5.20.0)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
multipart-post (2.4.0)
nest (3.2.0)
redic
net-http-persistent (4.0.2)
Expand Down Expand Up @@ -833,7 +834,7 @@ GEM
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
request_store (1.5.1)
request_store (1.6.0)
rack (>= 1.4)
responders (3.1.1)
actionpack (>= 5.2)
Expand Down Expand Up @@ -948,7 +949,7 @@ GEM
sidekiq-status (3.0.3)
chronic_duration
sidekiq (>= 6.0, < 8)
signet (0.18.0)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
Expand Down Expand Up @@ -1058,7 +1059,6 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand Down
2 changes: 1 addition & 1 deletion docker/start-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source scl_source enable devtoolset-8

mkdir -p /opt/hyrax/log/
echo "#### Ensure rubygems system is up to date before bundle installing"
gem install rubygems-update -v '~> 3.4'
gem install rubygems-update -v 3.4.20
update_rubygems >> /dev/null

echo "#### Bundle install"
Expand Down
2 changes: 1 addition & 1 deletion docker/start-sidekiq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ until $(curl --output /dev/null --silent --head --fail $SERVICE_URL); do
done

echo "#### Ensure rubygems system is up to date before bundle installing"
gem install rubygems-update -v '~> 3.4'
gem install rubygems-update -v 3.4.20
update_rubygems >> /dev/null

echo "#### Starting sidekiq"
Expand Down

0 comments on commit fd73fcf

Please sign in to comment.