summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <happydooby@gmail.com>2019-08-13 17:26:25 -0700
committerDessalines <happydooby@gmail.com>2019-08-13 17:26:25 -0700
commit0cd84440f4b35dbc7d7fa825291c783114b327c9 (patch)
tree3ee0ddf34cc37a719dfaae90b3b7c2d7f916533f
parent3246d5d670d0d5e10310a90c6fd81a7dc9e97e54 (diff)
parentc148eefc1df3eda124246691f62cc7ecfe2d3558 (diff)
Merge branch 'dev' into nsfw
-rw-r--r--docker-compose.yml6
-rw-r--r--docker/docker-compose.yml6
2 files changed, 10 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b9f3171..8607d546 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,12 +2,14 @@ version: '2.4'
services:
db:
- image: postgres
+ image: postgres:12-alpine
restart: always
environment:
POSTGRES_USER: rrr
POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr
+ volumes:
+ - db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 5s
@@ -27,3 +29,5 @@ services:
depends_on:
db:
condition: service_healthy
+volumes:
+ db:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4f5d51a9..aafcae1a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,12 +2,14 @@ version: '2.4'
services:
db:
- image: postgres
+ image: postgres:12-alpine
restart: always
environment:
POSTGRES_USER: rrr
POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr
+ volumes:
+ - db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 5s
@@ -26,3 +28,5 @@ services:
depends_on:
db:
condition: service_healthy
+volumes:
+ db: