From 1946c1925062b97cce3f5ab41cd1cac644f1b886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 8 Sep 2023 12:29:32 +0200
Subject: [PATCH] postgres: add

---
 .env               |  2 +-
 baserow.env        | 12 ++++++------
 docker-compose.yml | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index 57027a1..6cd42d1 100644
--- a/.env
+++ b/.env
@@ -16,7 +16,7 @@ EMAIL_HOST=smtp.gmail.com
 EMAIL_PASSWORD=sebrubdsgkuptcjr
 EMAIL_PORT=587
 POSTGRES_HOST=postgres
-POSTGRES_USERNAME=lukas
+POSTGRES_USER=lukas
 POSTGRES_PASSWORD=kralovna
 POSTGRES_PORT=5432
 MYSQL_USER=lukas
diff --git a/baserow.env b/baserow.env
index 60830c5..42efe82 100644
--- a/baserow.env
+++ b/baserow.env
@@ -1,12 +1,12 @@
 BASEROW_PUBLIC_URL=https://baserow.${DOMAIN}
-DATABASE_HOST=postgres
+DATABASE_HOST=${POSTGRES_HOST}
 DATABASE_NAME=baserow
 DATABASE_USER=baserow
 DATABASE_PASSWORD=S@8rBtSApf@YpNLXS!2hr2F$
 EMAIL_SMTP=1
-EMAIL_SMTP_HOST=smtp.gmail.com
-EMAIL_SMTP_PASSWORD=sebrubdsgkuptcjr
-EMAIL_SMTP_PORT=587
+EMAIL_SMTP_HOST=${EMAIL_HOST}
+EMAIL_SMTP_PASSWORD=${EMAIL_PASSWORD}
+EMAIL_SMTP_PORT=${EMAIL_PORT}
 EMAIL_SMTP_USE_TLS=1
-EMAIL_SMTP_USER=kucharczyk.lukas@gmail.com
-FROM_EMAIL=kucharczyk.lukas@gmail.com
\ No newline at end of file
+EMAIL_SMTP_USER=${EMAIL_FROM}
+FROM_EMAIL=${EMAIL_FROM}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e64ab38..a7f09f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -368,7 +368,7 @@ services:
       - snibox.env
     environment:
       DB_NAME: "${SNIBOX_POSTGRES_DB_NAME}"
-      DB_USER: "${POSTGRES_USERNAME}"
+      DB_USER: "${POSTGRES_USER}"
       DB_PASS: "${POSTGRES_PASSWORD}"
       DB_HOST: "${POSTGRES_HOST}"
       DB_PORT: "${POSTGRES_PORT}"
@@ -759,6 +759,19 @@ services:
     profiles:
       - base
 
+  postgres:
+    container_name: postgres
+    image: postgres:latest
+    networks:
+      - postgres
+    ports:
+      - "${BASEROW_EXTERNAL_PORT}:${BASEROW_INTERNAL_PORT}"
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/postgres:/var/lib/postgresql/data"
+    restart: unless-stopped
+    profiles:
+      - base
+      - infra