Skip to content

Commit 11b905d

Browse files
committed
Update ruby2.2 to ruby2.5
Add GEM ENV to resolve postCommit bundle command
1 parent 1982df2 commit 11b905d

File tree

4 files changed

+33
-36
lines changed

4 files changed

+33
-36
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
language: ruby
22
sudo: false
33
rvm:
4-
- 2.2
5-
- 2.3
6-
- 2.4
74
- 2.5
85
before_install:
96
- cp -p Gemfile.lock Gemfile.lock.org

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM centos/ruby-22-centos7
1+
FROM centos/ruby-25-centos7
22
USER default
33
EXPOSE 8080
44
ENV RACK_ENV production
55
ENV RAILS_ENV production
66
COPY . /opt/app-root/src/
7-
RUN scl enable rh-ruby22 "bundle install"
8-
CMD ["scl", "enable", "rh-ruby22", "./run.sh"]
7+
ENV GEM_HOME ~/.gem
8+
RUN scl enable rh-ruby25 "bundle install"
9+
CMD ["scl", "enable", "rh-ruby25", "./run.sh"]
910

1011
USER root
1112
RUN chmod og+rw /opt/app-root/src/db

Gemfile

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

3-
gem 'sinatra', '2.0.5'
4-
gem 'sinatra-activerecord', '2.0.13'
3+
gem 'sinatra', '2.0.7'
4+
gem 'sinatra-activerecord', '2.0.14'
55
gem 'mysql2', '0.4.10'
6-
gem 'rake', '12.3.0'
7-
gem 'minitest', '5.11.3'
8-
gem 'i18n', '0.9.3'
9-
6+
gem 'rake', '13.0.0'
7+
gem 'minitest', '5.13.0'
8+
gem 'i18n', '1.7.0'

Gemfile.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (5.1.4)
5-
activesupport (= 5.1.4)
6-
activerecord (5.1.4)
7-
activemodel (= 5.1.4)
8-
activesupport (= 5.1.4)
9-
arel (~> 8.0)
10-
activesupport (5.1.4)
4+
activemodel (6.0.0)
5+
activesupport (= 6.0.0)
6+
activerecord (6.0.0)
7+
activemodel (= 6.0.0)
8+
activesupport (= 6.0.0)
9+
activesupport (6.0.0)
1110
concurrent-ruby (~> 1.0, >= 1.0.2)
12-
i18n (~> 0.7)
11+
i18n (>= 0.7, < 2)
1312
minitest (~> 5.1)
1413
tzinfo (~> 1.1)
15-
arel (8.0.0)
16-
concurrent-ruby (1.0.5)
17-
i18n (0.9.3)
14+
zeitwerk (~> 2.1, >= 2.1.8)
15+
concurrent-ruby (1.1.5)
16+
i18n (1.7.0)
1817
concurrent-ruby (~> 1.0)
19-
minitest (5.11.3)
18+
minitest (5.13.0)
2019
mustermann (1.0.3)
2120
mysql2 (0.4.10)
22-
rack (2.0.6)
23-
rack-protection (2.0.5)
21+
rack (2.0.7)
22+
rack-protection (2.0.7)
2423
rack
25-
rake (12.3.0)
26-
sinatra (2.0.5)
24+
rake (13.0.0)
25+
sinatra (2.0.7)
2726
mustermann (~> 1.0)
2827
rack (~> 2.0)
29-
rack-protection (= 2.0.5)
28+
rack-protection (= 2.0.7)
3029
tilt (~> 2.0)
31-
sinatra-activerecord (2.0.13)
30+
sinatra-activerecord (2.0.14)
3231
activerecord (>= 3.2)
3332
sinatra (>= 1.0)
3433
thread_safe (0.3.6)
35-
tilt (2.0.9)
34+
tilt (2.0.10)
3635
tzinfo (1.2.5)
3736
thread_safe (~> 0.1)
37+
zeitwerk (2.2.1)
3838

3939
PLATFORMS
4040
ruby
4141

4242
DEPENDENCIES
43-
i18n (= 0.9.3)
44-
minitest (= 5.11.3)
43+
i18n (= 1.7.0)
44+
minitest (= 5.13.0)
4545
mysql2 (= 0.4.10)
46-
rake (= 12.3.0)
47-
sinatra (= 2.0.5)
48-
sinatra-activerecord (= 2.0.13)
46+
rake (= 13.0.0)
47+
sinatra (= 2.0.7)
48+
sinatra-activerecord (= 2.0.14)

0 commit comments

Comments
 (0)