Skip to content

Commit fec5af4

Browse files
authored
fix mimemagic download issue by rails update (linuxfrorg#301)
Update were applied with: bundle update --patch rails from a Docker image with bundler version 1.17.3 as defined in the Gemfile.lock Dockerfile for linuxfr.org image has been updated to use exactly same bundler version has defined by the Gemfile.lock
1 parent bef2f41 commit fec5af4

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

Gemfile.lock

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,43 +41,43 @@ GIT
4141
GEM
4242
remote: https://rubygems.org/
4343
specs:
44-
actioncable (5.2.4.4)
45-
actionpack (= 5.2.4.4)
44+
actioncable (5.2.5)
45+
actionpack (= 5.2.5)
4646
nio4r (~> 2.0)
4747
websocket-driver (>= 0.6.1)
48-
actionmailer (5.2.4.4)
49-
actionpack (= 5.2.4.4)
50-
actionview (= 5.2.4.4)
51-
activejob (= 5.2.4.4)
48+
actionmailer (5.2.5)
49+
actionpack (= 5.2.5)
50+
actionview (= 5.2.5)
51+
activejob (= 5.2.5)
5252
mail (~> 2.5, >= 2.5.4)
5353
rails-dom-testing (~> 2.0)
54-
actionpack (5.2.4.4)
55-
actionview (= 5.2.4.4)
56-
activesupport (= 5.2.4.4)
54+
actionpack (5.2.5)
55+
actionview (= 5.2.5)
56+
activesupport (= 5.2.5)
5757
rack (~> 2.0, >= 2.0.8)
5858
rack-test (>= 0.6.3)
5959
rails-dom-testing (~> 2.0)
6060
rails-html-sanitizer (~> 1.0, >= 1.0.2)
61-
actionview (5.2.4.4)
62-
activesupport (= 5.2.4.4)
61+
actionview (5.2.5)
62+
activesupport (= 5.2.5)
6363
builder (~> 3.1)
6464
erubi (~> 1.4)
6565
rails-dom-testing (~> 2.0)
6666
rails-html-sanitizer (~> 1.0, >= 1.0.3)
67-
activejob (5.2.4.4)
68-
activesupport (= 5.2.4.4)
67+
activejob (5.2.5)
68+
activesupport (= 5.2.5)
6969
globalid (>= 0.3.6)
70-
activemodel (5.2.4.4)
71-
activesupport (= 5.2.4.4)
72-
activerecord (5.2.4.4)
73-
activemodel (= 5.2.4.4)
74-
activesupport (= 5.2.4.4)
70+
activemodel (5.2.5)
71+
activesupport (= 5.2.5)
72+
activerecord (5.2.5)
73+
activemodel (= 5.2.5)
74+
activesupport (= 5.2.5)
7575
arel (>= 9.0)
76-
activestorage (5.2.4.4)
77-
actionpack (= 5.2.4.4)
78-
activerecord (= 5.2.4.4)
79-
marcel (~> 0.3.1)
80-
activesupport (5.2.4.4)
76+
activestorage (5.2.5)
77+
actionpack (= 5.2.5)
78+
activerecord (= 5.2.5)
79+
marcel (~> 1.0.0)
80+
activesupport (5.2.5)
8181
concurrent-ruby (~> 1.0, >= 1.0.2)
8282
i18n (>= 0.7, < 2)
8383
minitest (~> 5.1)
@@ -120,7 +120,7 @@ GEM
120120
coffee-script-source
121121
execjs
122122
coffee-script-source (1.12.2)
123-
concurrent-ruby (1.1.7)
123+
concurrent-ruby (1.1.8)
124124
crass (1.0.6)
125125
daemons (1.2.6)
126126
debug_inspector (0.0.3)
@@ -166,7 +166,7 @@ GEM
166166
html_truncator (0.4.2)
167167
nokogiri (~> 1.5)
168168
htmlentities (4.3.4)
169-
i18n (1.8.5)
169+
i18n (1.8.10)
170170
concurrent-ruby (~> 1.0)
171171
inherited_resources (1.9.0)
172172
actionpack (>= 4.2, < 5.3)
@@ -199,17 +199,15 @@ GEM
199199
nokogiri (>= 1.5.9)
200200
mail (2.7.1)
201201
mini_mime (>= 0.1.1)
202-
marcel (0.3.3)
203-
mimemagic (~> 0.3.2)
202+
marcel (1.0.1)
204203
method_source (0.9.2)
205204
mime-types (3.2.2)
206205
mime-types-data (~> 3.2015)
207206
mime-types-data (3.2018.0812)
208-
mimemagic (0.3.5)
209207
mini_magick (4.9.4)
210-
mini_mime (1.0.2)
208+
mini_mime (1.0.3)
211209
mini_portile2 (2.4.0)
212-
minitest (5.14.2)
210+
minitest (5.14.4)
213211
mo (1.4.0)
214212
boson
215213
msgpack (1.3.3)
@@ -240,18 +238,18 @@ GEM
240238
rack (2.2.3)
241239
rack-test (1.1.0)
242240
rack (>= 1.0, < 3)
243-
rails (5.2.4.4)
244-
actioncable (= 5.2.4.4)
245-
actionmailer (= 5.2.4.4)
246-
actionpack (= 5.2.4.4)
247-
actionview (= 5.2.4.4)
248-
activejob (= 5.2.4.4)
249-
activemodel (= 5.2.4.4)
250-
activerecord (= 5.2.4.4)
251-
activestorage (= 5.2.4.4)
252-
activesupport (= 5.2.4.4)
241+
rails (5.2.5)
242+
actioncable (= 5.2.5)
243+
actionmailer (= 5.2.5)
244+
actionpack (= 5.2.5)
245+
actionview (= 5.2.5)
246+
activejob (= 5.2.5)
247+
activemodel (= 5.2.5)
248+
activerecord (= 5.2.5)
249+
activestorage (= 5.2.5)
250+
activesupport (= 5.2.5)
253251
bundler (>= 1.3.0)
254-
railties (= 5.2.4.4)
252+
railties (= 5.2.5)
255253
sprockets-rails (>= 2.0.0)
256254
rails-dom-testing (2.0.3)
257255
activesupport (>= 4.2.0)
@@ -262,9 +260,9 @@ GEM
262260
dimensions (> 0)
263261
mime-types (> 0)
264262
sass (> 0)
265-
railties (5.2.4.4)
266-
actionpack (= 5.2.4.4)
267-
activesupport (= 5.2.4.4)
263+
railties (5.2.5)
264+
actionpack (= 5.2.5)
265+
activesupport (= 5.2.5)
268266
method_source
269267
rake (>= 0.8.7)
270268
thor (>= 0.19.0, < 2.0)
@@ -300,7 +298,7 @@ GEM
300298
sprockets (3.7.2)
301299
concurrent-ruby (~> 1.0)
302300
rack (> 1, < 3)
303-
sprockets-rails (3.2.1)
301+
sprockets-rails (3.2.2)
304302
actionpack (>= 4.0)
305303
activesupport (>= 4.0)
306304
sprockets (>= 3.0.0)
@@ -314,7 +312,7 @@ GEM
314312
thor (1.0.1)
315313
thread_safe (0.3.6)
316314
tilt (2.0.8)
317-
tzinfo (1.2.7)
315+
tzinfo (1.2.9)
318316
thread_safe (~> 0.1)
319317
uglifier (4.1.18)
320318
execjs (>= 0.3.0, < 3)

deployment/linuxfr.org/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN echo 'deb http://deb.debian.org/debian stretch-backports main' >> '/etc/apt/
1717
hunspell-fr-comprehensive ruby ruby-dev ruby-rack \
1818
&& apt-get install -t stretch-backports -y --no-install-recommends \
1919
nodejs npm \
20-
&& gem install bundler \
20+
&& gem install bundler -v 1.17.3 \
2121
&& apt-get clean
2222

2323
RUN mkdir /home/linuxfr.org

0 commit comments

Comments
 (0)