Merge branch 'master' into documentation

This commit is contained in:
Dessalines 2019-04-06 12:18:12 -07:00
commit ef221cc3f2
2 changed files with 10 additions and 6 deletions

View file

@ -12,8 +12,7 @@ before_script:
before_install: before_install:
- cd server - cd server
script: script:
- cargo install diesel_cli --no-default-features --features postgres - cargo install --force diesel_cli --no-default-features --features postgres
- cargo build
- diesel migration run - diesel migration run
- cargo build --all - cargo build --all
- cargo test --all - cargo test --all

View file

@ -1,4 +1,4 @@
version: '3' version: '2.4'
services: services:
db: db:
@ -8,6 +8,11 @@ services:
POSTGRES_USER: rrr POSTGRES_USER: rrr
POSTGRES_PASSWORD: rrr POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr POSTGRES_DB: rrr
healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 30s
timeout: 30s
retries: 3
lemmy: lemmy:
build: build:
context: . context: .
@ -17,6 +22,6 @@ services:
environment: environment:
LEMMY_FRONT_END_DIR: /app/dist LEMMY_FRONT_END_DIR: /app/dist
DATABASE_URL: postgres://rrr:rrr@db:5432/rrr DATABASE_URL: postgres://rrr:rrr@db:5432/rrr
depends_on:
links: db:
- db condition: service_healthy