From 057859503e5ee4bd67450bf053332c97e91f16e2 Mon Sep 17 00:00:00 2001
From: ManUtopiK <emmanuel.salomon@gmail.com>
Date: Thu, 20 Oct 2022 19:12:33 +0200
Subject: [PATCH] added hasura + default variables

---
 composes/hasura/compose.yml   | 21 ++++++++++++++++++++-
 composes/pgadmin/compose.yml  |  6 +++---
 composes/postgres/compose.yml | 14 +++++++-------
 docker-compose.yml            |  5 +++++
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/composes/hasura/compose.yml b/composes/hasura/compose.yml
index c023af0..c708d31 100644
--- a/composes/hasura/compose.yml
+++ b/composes/hasura/compose.yml
@@ -1,2 +1,21 @@
 services:
-  hasura
\ No newline at end of file
+  hasura:
+    container_name: $APP_NAME-hasura
+    image: hasura/graphql-engine:v2.12.0
+    ports:
+    - 8080:8080
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: always
+    environment:
+      HASURA_GRAPHQL_DATABASE_URL: postgres://${ADMIN_USER}:${ADMIN_PASSWORD}@postgres:5432/${POSTGRES_DB:-$APP_NAME}
+      ## enable the console served by server
+      HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # set to "false" to disable console
+      ## enable debugging mode. It is recommended to disable this in production
+      HASURA_GRAPHQL_DEV_MODE: "true"
+      HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
+      HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-$ADMIN_PASSWORD}
+      HASURA_GRAPHQL_EXPERIMENTAL_FEATURES: "apollo_federation"
+
+      # N8N_DATABASE_URL: postgres://${POSTGRES_NON_ROOT_USER}:${POSTGRES_NON_ROOT_PASSWORD}@postgres:5432/n8n
\ No newline at end of file
diff --git a/composes/pgadmin/compose.yml b/composes/pgadmin/compose.yml
index e85c28d..0d1bd42 100644
--- a/composes/pgadmin/compose.yml
+++ b/composes/pgadmin/compose.yml
@@ -1,10 +1,10 @@
 services:
   pgadmin:
-    container_name: pgadmin
+    container_name: $APP_NAME-pgadmin
     image: dpage/pgadmin4:latest
     environment:
-      - PGADMIN_DEFAULT_EMAIL=${ADMIN_MAIL}
-      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASSWORD}
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-$ADMIN_MAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:-$ADMIN_PASSWORD}
     ports:
       - 5050:80
     restart: always
diff --git a/composes/postgres/compose.yml b/composes/postgres/compose.yml
index 08f52f1..405ca1b 100644
--- a/composes/postgres/compose.yml
+++ b/composes/postgres/compose.yml
@@ -1,14 +1,14 @@
 services:
   postgres:
-    container_name: postgres
+    container_name: $APP_NAME-postgres
     image: postgres:14
     restart: always
     environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-      - POSTGRES_NON_ROOT_USER
-      - POSTGRES_NON_ROOT_PASSWORD
+      - POSTGRES_DB=${POSTGRES_DB:-$APP_NAME}
+      - POSTGRES_USER=${POSTGRES_USER:-$ROOT_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-$ROOT_PASSWORD}
+      - POSTGRES_NON_ROOT_USER=${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}
+      - POSTGRES_NON_ROOT_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD:-$ADMIN_PASSWORD}
     volumes:
       - postgres_storage:/var/lib/postgresql/data
       - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
@@ -16,7 +16,7 @@ services:
       test:
         [
           'CMD-SHELL',
-          'pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}',
+          'pg_isready -h localhost -U ${POSTGRES_USER:-$ROOT_USER} -d ${POSTGRES_DB:-$APP_NAME}',
         ]
       interval: 5s
       timeout: 5s
diff --git a/docker-compose.yml b/docker-compose.yml
index 43a34ab..3b3c77b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,5 +13,10 @@ services:
       file: composes/pgadmin/compose.yml
       service: pgadmin
 
+  hasura:
+    extends:
+      file: composes/hasura/compose.yml
+      service: hasura
+
 volumes:
   postgres_storage: