Skip to content

Commit c419138

Browse files
committed
Bump ruby versions
1 parent 3ee613d commit c419138

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.4.2-alpine
1+
FROM ruby:2.5.1-alpine
22

33
RUN apk add --no-cache git
44

circle.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2
22
jobs:
3-
test-2-4: &test
3+
test-2-5: &test
44
docker:
55
- image: tmaier/docker-compose
66
environment:
77
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
8-
SERVICE_NAME: ruby-2-4
8+
SERVICE_NAME: ruby-2-5
99
steps:
1010
- checkout
1111
- setup_remote_docker:
@@ -21,6 +21,13 @@ jobs:
2121
docker start project
2222
docker-compose build $SERVICE_NAME
2323
- run: docker-compose run $SERVICE_NAME bin/ci
24+
test-2-4:
25+
<<: *test
26+
docker:
27+
- image: tmaier/docker-compose
28+
environment:
29+
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
30+
SERVICE_NAME: ruby-2-4
2431
test-2-3:
2532
<<: *test
2633
docker:
@@ -47,6 +54,7 @@ workflows:
4754
version: 2
4855
test:
4956
jobs:
57+
- test-2-5
5058
- test-2-4
5159
- test-2-3
5260
- test-2-2

docker-compose.ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ services:
33
app: &app
44
volumes:
55
- project:/app
6+
ruby-2-5:
7+
<<: *app
68
ruby-2-4:
79
<<: *app
810
ruby-2-3:

docker-compose.override.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ services:
66
- $HOME/.gitconfig:/home/ruby/.gitconfig:ro
77
- $HOME/.ssh:/home/ruby/.ssh:ro
88
- $HOME/.gem:/home/ruby/.gem
9+
ruby-2-5:
10+
<<: *app
911
ruby-2-4:
1012
<<: *app
1113
ruby-2-3:

docker-compose.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,32 @@ services:
55
context: .
66
dockerfile: Dockerfile.development
77
args:
8-
RUBY_VERSION: 2.4.2
8+
RUBY_VERSION: 2.5.0
99
environment:
1010
LANGUAGE_SERVER_RUBY_REMOTE_ROOT: $PWD
1111
volumes:
1212
- vendor:/vendor
1313
- home:/home/ruby
14+
ruby-2-5:
15+
<<: *app
1416
ruby-2-4:
1517
<<: *app
18+
build:
19+
<<: *app-build
20+
args:
21+
RUBY_VERSION: 2.4.3
1622
ruby-2-3:
1723
<<: *app
1824
build:
1925
<<: *app-build
2026
args:
21-
RUBY_VERSION: 2.3.4
27+
RUBY_VERSION: 2.3.6
2228
ruby-2-2:
2329
<<: *app
2430
build:
2531
<<: *app-build
2632
args:
27-
RUBY_VERSION: 2.2.7
33+
RUBY_VERSION: 2.2.9
2834
volumes:
2935
home:
3036
vendor:

0 commit comments

Comments
 (0)