Skip to content

Commit 0b62b04

Browse files
lampham789lampham789
authored
Merge pull request #37 from cdlib/update_dependencies
Update dependencies for the PID Service
2 parents 23827e9 + 67e47d9 commit 0b62b04

File tree

9 files changed

+234
-69
lines changed

9 files changed

+234
-69
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ log/*.pid
1414
log/*.out
1515
log/*.gz
1616
scripts/.ipynb_checkpoints/*
17+
app/db/test.sqlite3*

‎app/Dockerfile.app‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM ruby:3.2.2-slim-bullseye AS base
1+
ARG TARGET_PLATFORM=linux/amd64
2+
ARG IMAGE_TAG=3.3.7-slim-bullseye
3+
4+
FROM --platform=${TARGET_PLATFORM} ruby:${IMAGE_TAG} AS base
25

36
RUN apt-get update -qq \
47
&& apt-get install -y \
@@ -23,7 +26,7 @@ COPY Gemfile Gemfile.lock ./
2326
RUN bundle config set --local without 'test' && \
2427
bundle install
2528

26-
FROM base AS final
29+
FROM --platform=$TARGET_PLATFORM base AS final
2730

2831
COPY --from=dependencies /usr/local/bundle /usr/local/bundle
2932

@@ -33,4 +36,4 @@ COPY . .
3336

3437
EXPOSE 80
3538

36-
CMD ["bundle", "exec", "puma", "-p", "80"]
39+
CMD ["bundle", "exec", "puma", "-p", "80"]

‎app/Dockerfile.test‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM ruby:3.2.2-slim-bullseye
1+
ARG TARGET_PLATFORM=linux/amd64
2+
ARG IMAGE_TAG=3.3.7-slim-bullseye
3+
4+
FROM --platform=${TARGET_PLATFORM} ruby:${IMAGE_TAG}
25

36
# Download dependencies for testing
47
RUN apt-get update -qq \
@@ -59,4 +62,4 @@ RUN bundle config set --local with 'test' && \
5962

6063
COPY . .
6164

62-
RUN ["rake", "test"]
65+
RUN ["rake", "test"]

‎app/Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
source 'https://rubygems.org'
22

3-
ruby '3.2.2'
3+
ruby '3.3.7'
44

55
gem 'sinatra'
66
gem 'puma'
77

8-
gem 'activerecord'
8+
gem 'activerecord', '7.2.2.1'
99
gem 'mysql2'
1010
gem 'will_paginate'
1111

‎app/Gemfile.lock‎

Lines changed: 90 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,146 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (7.1.3.2)
5-
activesupport (= 7.1.3.2)
6-
activerecord (7.1.3.2)
7-
activemodel (= 7.1.3.2)
8-
activesupport (= 7.1.3.2)
4+
activemodel (7.2.2.1)
5+
activesupport (= 7.2.2.1)
6+
activerecord (7.2.2.1)
7+
activemodel (= 7.2.2.1)
8+
activesupport (= 7.2.2.1)
99
timeout (>= 0.4.0)
10-
activesupport (7.1.3.2)
10+
activesupport (7.2.2.1)
1111
base64
12+
benchmark (>= 0.3)
1213
bigdecimal
13-
concurrent-ruby (~> 1.0, >= 1.0.2)
14+
concurrent-ruby (~> 1.0, >= 1.3.1)
1415
connection_pool (>= 2.2.5)
1516
drb
1617
i18n (>= 1.6, < 2)
18+
logger (>= 1.4.2)
1719
minitest (>= 5.1)
18-
mutex_m
19-
tzinfo (~> 2.0)
20-
addressable (2.8.6)
21-
public_suffix (>= 2.0.2, < 6.0)
20+
securerandom (>= 0.3)
21+
tzinfo (~> 2.0, >= 2.0.5)
22+
addressable (2.8.7)
23+
public_suffix (>= 2.0.2, < 7.0)
2224
base64 (0.2.0)
23-
bigdecimal (3.1.7)
24-
capybara (3.39.2)
25+
benchmark (0.4.0)
26+
bigdecimal (3.1.9)
27+
capybara (3.40.0)
2528
addressable
2629
matrix
2730
mini_mime (>= 0.1.3)
28-
nokogiri (~> 1.8)
31+
nokogiri (~> 1.11)
2932
rack (>= 1.6.0)
3033
rack-test (>= 0.6.3)
3134
regexp_parser (>= 1.5, < 3.0)
3235
xpath (~> 3.2)
33-
concurrent-ruby (1.2.3)
34-
connection_pool (2.4.1)
35-
date (3.3.4)
36+
concurrent-ruby (1.3.5)
37+
connection_pool (2.5.0)
38+
date (3.4.1)
3639
drb (2.2.1)
3740
fakeredis (0.9.2)
3841
redis (~> 4.8)
39-
i18n (1.14.4)
42+
i18n (1.14.7)
4043
concurrent-ruby (~> 1.0)
44+
logger (1.6.6)
4145
mail (2.8.1)
4246
mini_mime (>= 0.1.1)
4347
net-imap
4448
net-pop
4549
net-smtp
4650
matrix (0.4.2)
4751
mini_mime (1.1.5)
48-
minitest (5.22.3)
49-
mustermann (3.0.0)
52+
minitest (5.25.4)
53+
mustermann (3.0.3)
5054
ruby2_keywords (~> 0.0.1)
51-
mutex_m (0.2.0)
52-
mysql2 (0.5.5)
53-
net-imap (0.4.8)
55+
mysql2 (0.5.6)
56+
net-imap (0.5.6)
5457
date
5558
net-protocol
5659
net-pop (0.1.2)
5760
net-protocol
5861
net-protocol (0.2.2)
5962
timeout
60-
net-smtp (0.4.0)
63+
net-smtp (0.5.1)
6164
net-protocol
62-
nio4r (2.7.0)
63-
nokogiri (1.16.3-x86_64-linux)
65+
nio4r (2.7.4)
66+
nokogiri (1.18.2-aarch64-linux-gnu)
67+
racc (~> 1.4)
68+
nokogiri (1.18.2-aarch64-linux-musl)
69+
racc (~> 1.4)
70+
nokogiri (1.18.2-arm-linux-gnu)
71+
racc (~> 1.4)
72+
nokogiri (1.18.2-arm-linux-musl)
73+
racc (~> 1.4)
74+
nokogiri (1.18.2-arm64-darwin)
75+
racc (~> 1.4)
76+
nokogiri (1.18.2-x86_64-darwin)
77+
racc (~> 1.4)
78+
nokogiri (1.18.2-x86_64-linux-gnu)
79+
racc (~> 1.4)
80+
nokogiri (1.18.2-x86_64-linux-musl)
6481
racc (~> 1.4)
65-
public_suffix (5.0.4)
66-
puma (6.4.0)
82+
public_suffix (6.0.1)
83+
puma (6.6.0)
6784
nio4r (~> 2.0)
68-
racc (1.7.3)
69-
rack (2.2.9)
70-
rack-protection (3.1.0)
71-
rack (~> 2.2, >= 2.2.4)
72-
rack-test (2.1.0)
85+
racc (1.8.1)
86+
rack (3.1.10)
87+
rack-protection (4.1.1)
88+
base64 (>= 0.1.0)
89+
logger (>= 1.6.0)
90+
rack (>= 3.0.0, < 4)
91+
rack-session (2.1.0)
92+
base64 (>= 0.1.0)
93+
rack (>= 3.0.0)
94+
rack-test (2.2.0)
7395
rack (>= 1.3)
7496
redis (4.8.1)
75-
regexp_parser (2.8.3)
76-
rexml (3.2.6)
97+
regexp_parser (2.10.0)
98+
rexml (3.4.0)
7799
ruby2_keywords (0.0.5)
78-
rubyzip (2.3.2)
79-
selenium-webdriver (4.16.0)
100+
rubyzip (2.4.1)
101+
securerandom (0.4.1)
102+
selenium-webdriver (4.28.0)
103+
base64 (~> 0.2)
104+
logger (~> 1.4)
80105
rexml (~> 3.2, >= 3.2.5)
81106
rubyzip (>= 1.2.2, < 3.0)
82107
websocket (~> 1.0)
83-
sinatra (3.1.0)
108+
sinatra (4.1.1)
109+
logger (>= 1.6.0)
84110
mustermann (~> 3.0)
85-
rack (~> 2.2, >= 2.2.4)
86-
rack-protection (= 3.1.0)
111+
rack (>= 3.0.0, < 4)
112+
rack-protection (= 4.1.1)
113+
rack-session (>= 2.0.0, < 3)
87114
tilt (~> 2.0)
88-
sqlite3 (1.6.9-x86_64-linux)
89-
tilt (2.3.0)
90-
timeout (0.4.1)
115+
sqlite3 (2.5.0-aarch64-linux-gnu)
116+
sqlite3 (2.5.0-aarch64-linux-musl)
117+
sqlite3 (2.5.0-arm-linux-gnu)
118+
sqlite3 (2.5.0-arm-linux-musl)
119+
sqlite3 (2.5.0-arm64-darwin)
120+
sqlite3 (2.5.0-x86_64-darwin)
121+
sqlite3 (2.5.0-x86_64-linux-gnu)
122+
sqlite3 (2.5.0-x86_64-linux-musl)
123+
tilt (2.6.0)
124+
timeout (0.4.3)
91125
tzinfo (2.0.6)
92126
concurrent-ruby (~> 1.0)
93-
websocket (1.2.10)
94-
will_paginate (4.0.0)
127+
websocket (1.2.11)
128+
will_paginate (4.0.1)
95129
xpath (3.2.0)
96130
nokogiri (~> 1.8)
97131

98132
PLATFORMS
99-
x86_64-linux
133+
aarch64-linux-gnu
134+
aarch64-linux-musl
135+
arm-linux-gnu
136+
arm-linux-musl
137+
arm64-darwin
138+
x86_64-darwin
139+
x86_64-linux-gnu
140+
x86_64-linux-musl
100141

101142
DEPENDENCIES
102-
activerecord
143+
activerecord (= 7.2.2.1)
103144
capybara
104145
fakeredis
105146
mail
@@ -115,7 +156,7 @@ DEPENDENCIES
115156
will_paginate
116157

117158
RUBY VERSION
118-
ruby 3.2.2p53
159+
ruby 3.3.7p123
119160

120161
BUNDLED WITH
121-
2.4.10
162+
2.6.3

0 commit comments

Comments
 (0)