mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-06-27 01:30:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into nsfw

Browse source
This commit is contained in:
Dessalines 2019-08-13 17:26:25 -07:00
parent b3d4a5c4ce a17fbc6e61
commit 6e8da9cc9e
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker-compose.yml
View file

@ -2,12 +2,14 @@ version: '2.4'
services: services:
db: db:
image: postgres image: postgres:12-alpine
restart: always restart: always
environment: environment:
POSTGRES_USER: rrr POSTGRES_USER: rrr
POSTGRES_PASSWORD: rrr POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr POSTGRES_DB: rrr
volumes:
- db:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"] test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 5s interval: 5s
@ -27,3 +29,5 @@ services:
depends_on: depends_on:
db: db:
condition: service_healthy condition: service_healthy
volumes:
db:

6
docker/docker-compose.yml
View file

@ -2,12 +2,14 @@ version: '2.4'
services: services:
db: db:
image: postgres image: postgres:12-alpine
restart: always restart: always
environment: environment:
POSTGRES_USER: rrr POSTGRES_USER: rrr
POSTGRES_PASSWORD: rrr POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr POSTGRES_DB: rrr
volumes:
- db:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"] test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 5s interval: 5s
@ -26,3 +28,5 @@ services:
depends_on: depends_on:
db: db:
condition: service_healthy condition: service_healthy
volumes:
db: