Update ruby dependencies

This commit is contained in:
John Lees-Miller
2020-05-30 08:48:05 +01:00
parent a453d1ce09
commit 116a62834a
5 changed files with 10 additions and 10 deletions

View File

@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
- run: cp development.env.template development.env
- run: docker-compose build
- run: docker-compose up -d db
- run: docker-compose run --rm web bash -lc 'bin/rails db:create db:migrate'
- run: docker-compose run --rm web bash -lc 'bin/rails test'
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml build
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml up -d db
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails db:create db:migrate'
- run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails test'

View File

@ -1,7 +1,5 @@
FROM ruby:2.5.0
FROM ruby:2.7.1
# Note: must install newer nodejs to work around
# https://github.com/docker-library/ruby/issues/226
RUN apt-get update -qq &&\
curl -sL https://deb.nodesource.com/setup_10.x | bash - &&\
apt-get install -y build-essential libpq-dev nodejs &&\

View File

@ -298,6 +298,3 @@ DEPENDENCIES
spring-watcher-listen (~> 2.0.0)
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
BUNDLED WITH
1.16.1

3
docker-compose.ci.yml Normal file
View File

@ -0,0 +1,3 @@
web:
env_file:
- development.env.template

View File

@ -1,5 +1,7 @@
db:
image: postgres:10
environment:
POSTGRES_HOST_AUTH_METHOD: trust
ports:
- '5432:5432'