Skip to content

Commit a731606

Browse files
committed
Updated Ruby and gems
1 parent 1da2127 commit a731606

File tree

3 files changed

+104
-105
lines changed

3 files changed

+104
-105
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ruby:2.7.3-alpine3.12
1+
FROM ruby:2.7.4-alpine3.13
22

3-
MAINTAINER Andrew Kane <andrew@chartkick.com>
3+
MAINTAINER Andrew Kane <andrew@ankane.org>
44

55
RUN apk add --update ruby-dev build-base \
66
libxml2-dev libxslt-dev pcre-dev libffi-dev \

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ gem "aws-sdk-athena"
1111
gem "aws-sdk-glue"
1212
gem "drill-sergeant"
1313
gem "cassandra-driver"
14-
gem "elasticsearch"
15-
gem "elasticsearch-xpack"
14+
gem "elasticsearch", "< 7.14"
15+
gem "elasticsearch-xpack", "< 7.14"
1616
gem "google-cloud-bigquery"
1717
gem "hexspace"
1818
# gem "ibm_db"

Gemfile.lock

Lines changed: 100 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.3.7)
5-
actionpack (= 6.0.3.7)
4+
actioncable (6.0.4.1)
5+
actionpack (= 6.0.4.1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.3.7)
9-
actionpack (= 6.0.3.7)
10-
activejob (= 6.0.3.7)
11-
activerecord (= 6.0.3.7)
12-
activestorage (= 6.0.3.7)
13-
activesupport (= 6.0.3.7)
8+
actionmailbox (6.0.4.1)
9+
actionpack (= 6.0.4.1)
10+
activejob (= 6.0.4.1)
11+
activerecord (= 6.0.4.1)
12+
activestorage (= 6.0.4.1)
13+
activesupport (= 6.0.4.1)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.3.7)
16-
actionpack (= 6.0.3.7)
17-
actionview (= 6.0.3.7)
18-
activejob (= 6.0.3.7)
15+
actionmailer (6.0.4.1)
16+
actionpack (= 6.0.4.1)
17+
actionview (= 6.0.4.1)
18+
activejob (= 6.0.4.1)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.3.7)
22-
actionview (= 6.0.3.7)
23-
activesupport (= 6.0.3.7)
21+
actionpack (6.0.4.1)
22+
actionview (= 6.0.4.1)
23+
activesupport (= 6.0.4.1)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.3.7)
29-
actionpack (= 6.0.3.7)
30-
activerecord (= 6.0.3.7)
31-
activestorage (= 6.0.3.7)
32-
activesupport (= 6.0.3.7)
28+
actiontext (6.0.4.1)
29+
actionpack (= 6.0.4.1)
30+
activerecord (= 6.0.4.1)
31+
activestorage (= 6.0.4.1)
32+
activesupport (= 6.0.4.1)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.3.7)
35-
activesupport (= 6.0.3.7)
34+
actionview (6.0.4.1)
35+
activesupport (= 6.0.4.1)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.3.7)
41-
activesupport (= 6.0.3.7)
40+
activejob (6.0.4.1)
41+
activesupport (= 6.0.4.1)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.3.7)
44-
activesupport (= 6.0.3.7)
45-
activerecord (6.0.3.7)
46-
activemodel (= 6.0.3.7)
47-
activesupport (= 6.0.3.7)
48-
activerecord6-redshift-adapter (1.1.3)
49-
activerecord (~> 6.0, >= 6.0.0)
50-
pg (>= 0.18)
51-
activestorage (6.0.3.7)
52-
actionpack (= 6.0.3.7)
53-
activejob (= 6.0.3.7)
54-
activerecord (= 6.0.3.7)
43+
activemodel (6.0.4.1)
44+
activesupport (= 6.0.4.1)
45+
activerecord (6.0.4.1)
46+
activemodel (= 6.0.4.1)
47+
activesupport (= 6.0.4.1)
48+
activerecord6-redshift-adapter (1.2.1)
49+
activerecord (~> 6.0)
50+
pg (~> 1.0)
51+
activestorage (6.0.4.1)
52+
actionpack (= 6.0.4.1)
53+
activejob (= 6.0.4.1)
54+
activerecord (= 6.0.4.1)
5555
marcel (~> 1.0.0)
56-
activesupport (6.0.3.7)
56+
activesupport (6.0.4.1)
5757
concurrent-ruby (~> 1.0, >= 1.0.2)
5858
i18n (>= 0.7, < 2)
5959
minitest (~> 5.1)
6060
tzinfo (~> 1.1)
6161
zeitwerk (~> 2.2, >= 2.2.2)
62-
addressable (2.7.0)
62+
addressable (2.8.0)
6363
public_suffix (>= 2.0.2, < 5.0)
64-
aws-eventstream (1.1.1)
65-
aws-partitions (1.456.0)
66-
aws-sdk-athena (1.37.0)
67-
aws-sdk-core (~> 3, >= 3.112.0)
64+
aws-eventstream (1.2.0)
65+
aws-partitions (1.501.0)
66+
aws-sdk-athena (1.41.0)
67+
aws-sdk-core (~> 3, >= 3.120.0)
6868
aws-sigv4 (~> 1.1)
69-
aws-sdk-core (3.114.0)
69+
aws-sdk-core (3.121.0)
7070
aws-eventstream (~> 1, >= 1.0.2)
7171
aws-partitions (~> 1, >= 1.239.0)
7272
aws-sigv4 (~> 1.1)
7373
jmespath (~> 1.0)
74-
aws-sdk-glue (1.87.0)
75-
aws-sdk-core (~> 3, >= 3.112.0)
74+
aws-sdk-glue (1.95.0)
75+
aws-sdk-core (~> 3, >= 3.120.0)
7676
aws-sigv4 (~> 1.1)
77-
aws-sigv4 (1.2.3)
77+
aws-sigv4 (1.4.0)
7878
aws-eventstream (~> 1, >= 1.0.2)
79-
blazer (2.4.2)
79+
blazer (2.4.3)
8080
activerecord (>= 5)
8181
chartkick (>= 3.2)
8282
railties (>= 5)
8383
safely_block (>= 0.1.1)
84-
bson (4.12.0)
84+
bson (4.12.1)
8585
builder (3.2.4)
8686
cassandra-driver (3.2.5)
8787
ione (~> 1.2)
88-
chartkick (4.0.4)
89-
concurrent-ruby (1.1.8)
88+
chartkick (4.0.5)
89+
concurrent-ruby (1.1.9)
9090
crass (1.0.6)
9191
declarative (0.0.20)
9292
drill-sergeant (0.1.3)
@@ -98,7 +98,7 @@ GEM
9898
elasticsearch-transport (7.5.0)
9999
faraday (>= 0.14, < 1)
100100
multi_json
101-
elasticsearch-xpack (7.12.0)
101+
elasticsearch-xpack (7.13.3)
102102
elasticsearch-api (>= 6)
103103
errbase (0.2.1)
104104
erubi (1.10.0)
@@ -111,40 +111,39 @@ GEM
111111
faraday_middleware-multi_json (0.0.6)
112112
faraday_middleware
113113
multi_json
114-
ffi (1.15.0)
115-
globalid (0.4.2)
116-
activesupport (>= 4.2.0)
117-
google-apis-bigquery_v2 (0.9.0)
118-
google-apis-core (~> 0.1)
119-
google-apis-core (0.3.0)
114+
ffi (1.15.4)
115+
globalid (0.5.2)
116+
activesupport (>= 5.0)
117+
google-apis-bigquery_v2 (0.17.0)
118+
google-apis-core (>= 0.4, < 2.a)
119+
google-apis-core (0.4.1)
120120
addressable (~> 2.5, >= 2.5.1)
121-
googleauth (~> 0.14)
122-
httpclient (>= 2.8.1, < 3.0)
121+
googleauth (>= 0.16.2, < 2.a)
122+
httpclient (>= 2.8.1, < 3.a)
123123
mini_mime (~> 1.0)
124124
representable (~> 3.0)
125-
retriable (>= 2.0, < 4.0)
125+
retriable (>= 2.0, < 4.a)
126126
rexml
127-
signet (~> 0.14)
128127
webrick
129-
google-cloud-bigquery (1.31.0)
128+
google-cloud-bigquery (1.35.1)
130129
concurrent-ruby (~> 1.0)
131130
google-apis-bigquery_v2 (~> 0.1)
132-
google-cloud-core (~> 1.2)
133-
googleauth (~> 0.9)
131+
google-cloud-core (~> 1.6)
132+
googleauth (>= 0.16.2, < 2.a)
134133
mini_mime (~> 1.0)
135134
google-cloud-core (1.6.0)
136135
google-cloud-env (~> 1.0)
137136
google-cloud-errors (~> 1.0)
138137
google-cloud-env (1.5.0)
139138
faraday (>= 0.17.3, < 2.0)
140139
google-cloud-errors (1.1.0)
141-
googleauth (0.16.2)
140+
googleauth (0.17.1)
142141
faraday (>= 0.17.3, < 2.0)
143142
jwt (>= 1.4, < 3.0)
144143
memoist (~> 0.16)
145144
multi_json (~> 1.11)
146145
os (>= 0.9, < 2.0)
147-
signet (~> 0.14)
146+
signet (~> 0.15)
148147
hashie (4.1.0)
149148
hexspace (0.1.1)
150149
thrift
@@ -156,18 +155,18 @@ GEM
156155
jmespath (1.4.0)
157156
json (2.5.1)
158157
jwt (2.2.3)
159-
loofah (2.9.1)
158+
loofah (2.12.0)
160159
crass (~> 1.0.2)
161160
nokogiri (>= 1.5.9)
162161
mail (2.7.1)
163162
mini_mime (>= 0.1.1)
164163
marcel (1.0.1)
165164
memoist (0.16.2)
166165
method_source (1.0.0)
167-
mini_mime (1.1.0)
168-
mini_portile2 (2.5.1)
166+
mini_mime (1.1.1)
167+
mini_portile2 (2.6.1)
169168
minitest (5.14.4)
170-
mongo (2.14.0)
169+
mongo (2.15.1)
171170
bson (>= 4.8.2, < 5.0.0)
172171
msgpack (1.4.2)
173172
multi_json (1.15.0)
@@ -184,55 +183,55 @@ GEM
184183
net_tcp_client (>= 2.0.1)
185184
typhoeus (>= 1.1.2)
186185
net_tcp_client (2.2.0)
187-
nio4r (2.5.7)
188-
nokogiri (1.11.4)
189-
mini_portile2 (~> 2.5.0)
186+
nio4r (2.5.8)
187+
nokogiri (1.12.4)
188+
mini_portile2 (~> 2.6.1)
190189
racc (~> 1.4)
191190
os (1.1.1)
192191
pg (1.2.3)
193-
presto-client (0.6.5)
192+
presto-client (0.6.6)
194193
faraday (~> 0.12)
195194
faraday_middleware (~> 0.12.2)
196195
msgpack (>= 0.7.0)
197196
public_suffix (4.0.6)
198-
puma (5.3.1)
197+
puma (5.4.0)
199198
nio4r (~> 2.0)
200199
racc (1.5.2)
201200
rack (2.2.3)
202201
rack-test (1.1.0)
203202
rack (>= 1.0, < 3)
204-
rails (6.0.3.7)
205-
actioncable (= 6.0.3.7)
206-
actionmailbox (= 6.0.3.7)
207-
actionmailer (= 6.0.3.7)
208-
actionpack (= 6.0.3.7)
209-
actiontext (= 6.0.3.7)
210-
actionview (= 6.0.3.7)
211-
activejob (= 6.0.3.7)
212-
activemodel (= 6.0.3.7)
213-
activerecord (= 6.0.3.7)
214-
activestorage (= 6.0.3.7)
215-
activesupport (= 6.0.3.7)
203+
rails (6.0.4.1)
204+
actioncable (= 6.0.4.1)
205+
actionmailbox (= 6.0.4.1)
206+
actionmailer (= 6.0.4.1)
207+
actionpack (= 6.0.4.1)
208+
actiontext (= 6.0.4.1)
209+
actionview (= 6.0.4.1)
210+
activejob (= 6.0.4.1)
211+
activemodel (= 6.0.4.1)
212+
activerecord (= 6.0.4.1)
213+
activestorage (= 6.0.4.1)
214+
activesupport (= 6.0.4.1)
216215
bundler (>= 1.3.0)
217-
railties (= 6.0.3.7)
216+
railties (= 6.0.4.1)
218217
sprockets-rails (>= 2.0.0)
219218
rails-dom-testing (2.0.3)
220219
activesupport (>= 4.2.0)
221220
nokogiri (>= 1.6)
222-
rails-html-sanitizer (1.3.0)
221+
rails-html-sanitizer (1.4.2)
223222
loofah (~> 2.3)
224-
railties (6.0.3.7)
225-
actionpack (= 6.0.3.7)
226-
activesupport (= 6.0.3.7)
223+
railties (6.0.4.1)
224+
actionpack (= 6.0.4.1)
225+
activesupport (= 6.0.4.1)
227226
method_source
228227
rake (>= 0.8.7)
229228
thor (>= 0.20.3, < 2.0)
230-
rake (13.0.3)
229+
rake (13.0.6)
231230
representable (3.1.1)
232231
declarative (< 0.1.0)
233232
trailblazer-option (>= 0.1.1, < 0.2.0)
234233
uber (< 0.2.0)
235-
restforce (5.0.5)
234+
restforce (5.1.0)
236235
faraday (>= 0.9.0, <= 2.0)
237236
faraday_middleware (>= 0.8.8, <= 2.0)
238237
hashie (>= 1.2.0, < 5.0)
@@ -241,8 +240,8 @@ GEM
241240
rexml (3.2.5)
242241
safely_block (0.3.0)
243242
errbase (>= 0.1.1)
244-
signet (0.15.0)
245-
addressable (~> 2.3)
243+
signet (0.16.0)
244+
addressable (~> 2.8)
246245
faraday (>= 0.17.3, < 2.0)
247246
jwt (>= 1.5, < 3.0)
248247
multi_json (~> 1.10)
@@ -256,7 +255,7 @@ GEM
256255
sqlite3 (1.4.2)
257256
thor (1.1.0)
258257
thread_safe (0.3.6)
259-
thrift (0.14.1)
258+
thrift (0.15.0)
260259
trailblazer-option (0.1.1)
261260
typhoeus (1.4.0)
262261
ethon (>= 0.9.0)
@@ -266,7 +265,7 @@ GEM
266265
tzinfo (>= 1.0.0)
267266
uber (0.1.0)
268267
webrick (1.7.0)
269-
websocket-driver (0.7.3)
268+
websocket-driver (0.7.5)
270269
websocket-extensions (>= 0.1.0)
271270
websocket-extensions (0.1.5)
272271
zeitwerk (2.4.2)
@@ -281,8 +280,8 @@ DEPENDENCIES
281280
blazer
282281
cassandra-driver
283282
drill-sergeant
284-
elasticsearch
285-
elasticsearch-xpack
283+
elasticsearch (< 7.14)
284+
elasticsearch-xpack (< 7.14)
286285
google-cloud-bigquery
287286
hexspace
288287
ignite-client
@@ -298,4 +297,4 @@ DEPENDENCIES
298297
tzinfo-data
299298

300299
BUNDLED WITH
301-
2.2.3
300+
2.2.22

0 commit comments

Comments
 (0)