Skip to content

Commit 116a628

Browse files
committed
Update ruby dependencies
1 parent a453d1c commit 116a628

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v2
2222

2323
- run: cp development.env.template development.env
24-
- run: docker-compose build
25-
- run: docker-compose up -d db
26-
- run: docker-compose run --rm web bash -lc 'bin/rails db:create db:migrate'
27-
- run: docker-compose run --rm web bash -lc 'bin/rails test'
24+
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml build
25+
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml up -d db
26+
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails db:create db:migrate'
27+
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails test'

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
FROM ruby:2.5.0
1+
FROM ruby:2.7.1
22

3-
# Note: must install newer nodejs to work around
4-
# https://github.com/docker-library/ruby/issues/226
53
RUN apt-get update -qq &&\
64
curl -sL https://deb.nodesource.com/setup_10.x | bash - &&\
75
apt-get install -y build-essential libpq-dev nodejs &&\

Gemfile.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,3 @@ DEPENDENCIES
298298
spring-watcher-listen (~> 2.0.0)
299299
uglifier (>= 1.3.0)
300300
web-console (>= 3.3.0)
301-
302-
BUNDLED WITH
303-
1.16.1

docker-compose.ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
web:
2+
env_file:
3+
- development.env.template

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
db:
22
image: postgres:10
3+
environment:
4+
POSTGRES_HOST_AUTH_METHOD: trust
35
ports:
46
- '5432:5432'
57

0 commit comments

Comments
 (0)