chore(docker): add postgresql service properly

.env.tpl

@@ -2,6 +2,7 @@ ANSIBLE_VAULT_KEY=${ANSIBLE_VAULT_KEY}
 ENV=${ENV}
 FLOWER_PORT=${FLOWER_PORT}
 FLOWER_PASSWORD=${FLOWER_PASSWORD}
+HOST_POSTGRES_DUMP=${HOST_POSTGRES_DUMP}
 MAPBOX_API_KEY=${MAPBOX_API_KEY}
 POSTGRES_HOST=${POSTGRES_HOST}
 POSTGRES_PORT=${POSTGRES_PORT}

Makefile

@@ -7,8 +7,7 @@ CONSOLE:=bash
 DOCKER=docker-compose \
 	--env-file .env \
 	--project-name eph-$(ENV) \
-	--file docker/compose-base.yaml \
-	--file docker/compose-$(ENV).yaml
+	--file docker/compose.yaml
 
 # DOCKER
 
@@ -21,22 +20,31 @@ docker-build:
 
 .PHONY:docker-start
 docker-start:
-	$(DOCKER) up -d ${SERVICES}
+	$(DOCKER) up --remove-orphans -d ${SERVICES}
 
 
 .PHONY:docker-stop
 docker-stop:
 	$(DOCKER) stop ${SERVICES}
 
 
+.PHONY:docker-down
+docker-down:
+	$(DOCKER) down --volumes
+
+
 .PHONY:docker-restart
 docker-restart: docker-stop docker-start
 	echo "[II] Docker services restarted!"
 
 
+.PHONY:docker-logs-follow
+docker-logs-follow:
+	$(DOCKER) logs --follow --tail 100 ${SERVICES}
+
 .PHONY:docker-logs
 docker-logs:
-	$(DOCKER) logs --follow --tail 100 ${SERVICES}
+	$(DOCKER) logs --tail 200 ${SERVICES}
 
 .PHONY: docker-wait
 docker-wait:

docker/compose-base.yaml → docker/compose.yaml

@@ -41,6 +41,7 @@ services:
     ports:
       - ${SUPERSET_PORT}:8088
     depends_on:
+      - epigraphhub-db
       - epigraphhub-redis
       - epigraphhub-celery
       - epigraphhub-celery-beat
@@ -136,6 +137,21 @@ services:
       timeout: 10s
       retries: 5
       start_period: 40s  # requires docker-compose 3.4
+    volumes:
+      - pgdata:/var/lib/postgresql/data/pgdata
+      - ${HOST_POSTGRES_DUMP}:/tmp/dump
+    ports:
+      - ${POSTGRES_PORT}:5432
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: ${POSTGRES_USER}
+      PGDATA: /var/lib/postgresql/data/pgdata
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -p ${POSTGRES_PORT} -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    command: -p ${POSTGRES_PORT}
 
   epigraphhub-flower:
     image: mher/flower:0.9.7
@@ -161,3 +177,4 @@ services:
 
 volumes:
   redis:
+  pgdata:

docker/postgresql/dump.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"
+
+if [ -f ${PROJECT_DIR}/.env ]; then
+    # Load Environment Variables
+    export $(cat ${PROJECT_DIR}/.env | grep -v '#' | sed 's/\r$//' | awk '/=/ {print $1}' )
+fi
+
+HOST_POSTGRES_DUMP=${HOST_POSTGRES_DUMP:-/tmp/dump}
+mkdir -p ${HOST_POSTGRES_DUMP}
+
+set -ex
+
+PGPASSWORD=${POSTGRES_PASSWORD} pg_dumpall \
+  --host ${POSTGRES_HOST} \
+  --port ${POSTGRES_PORT} \
+  --user ${POSTGRES_USER} \
+  > ${HOST_POSTGRES_DUMP}/$(date --iso-8601).dump