From fe422897ab1d131a6f65d7619607b4c92d48cc8f Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sat, 30 Jul 2022 15:47:06 -0700
Subject: [PATCH] Update dev docker deployment Rename environment variables,
 add tokens

---
 docker-compose.dev.yml |  2 ++
 docker-compose.yml     | 16 ++++++++++------
 example.env            |  9 +++++++++
 example.env.dev        | 11 +++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 example.env
 create mode 100644 example.env.dev

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 15decbd28..ed876a057 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -27,6 +27,8 @@ services:
       - DATABASE_URL=postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@db/${DATABASE_NAME}?schema=public&connection_limit=14&pool_timeout=20
       - DATABASE_PORT=${DATABASE_PORT}
       - TOKEN_SECRET=${TOKEN_SECRET}
+      - TOKEN_EXPIRATION=${TOKEN_EXPIRATION}
+      - TOKEN_REFRESH_EXPIRATION=${TOKEN_REFRESH_EXPIRATION}
     ports:
       - '9321:9321'
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index b04e9a888..f5f766390 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,12 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - ${DB_PERSIST_PATH}:/var/lib/postgresql/data
+      - ${DATABASE_PERSIST_PATH}:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER=${DB_USERNAME}
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_DB=${DB_NAME}
+      - POSTGRES_USER=${DATABASE_USERNAME}
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_DB=${DATABASE_NAME}
+    restart: always
   server:
     container_name: sonixd
     image: sonixd:latest
@@ -18,8 +19,11 @@ services:
       - db
     environment:
       - APP_BASE_URL=${APP_BASE_URL}
-      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@db/${DB_NAME}?schema=public&connection_limit=14&pool_timeout=20
-      - DATABASE_SECRET=${DB_SECRET}
+      - DATABASE_URL=postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@db/${DATABASE_NAME}?schema=public&connection_limit=14&pool_timeout=20
+      - DATABASE_SECRET=${DATABASE_SECRET}
+      - TOKEN_SECRET=${TOKEN_SECRET}
+      - TOKEN_EXPIRATION=${TOKEN_EXPIRATION}
+      - TOKEN_REFRESH_EXPIRATION=${TOKEN_REFRESH_EXPIRATION}
     ports:
       - '9321:9321'
     restart: always
diff --git a/example.env b/example.env
new file mode 100644
index 000000000..5224e5cc9
--- /dev/null
+++ b/example.env
@@ -0,0 +1,9 @@
+DATABASE_USERNAME=admin
+DATABASE_PASSWORD=admin
+DATABASE_NAME=sonixd
+DATABASE_PORT=5432
+DATABASE_PERSIST_PATH=C:/docker/sonixd/db
+TOKEN_SECRET=SUPERSECRET
+TOKEN_EXPIRATION=15d
+TOKEN_REFRESH_EXPIRATION=90d
+APP_BASE_URL=http://localhost:4343
diff --git a/example.env.dev b/example.env.dev
new file mode 100644
index 000000000..7a584a514
--- /dev/null
+++ b/example.env.dev
@@ -0,0 +1,11 @@
+# RENAME FILE TO ".env.dev" and use "npm run docker:up" on repository root
+
+DATABASE_USERNAME=admin
+DATABASE_PASSWORD=admin
+DATABASE_NAME=sonixd
+DATABASE_PORT=5432
+DATABASE_PERSIST_PATH=C:/docker/sonixd/db
+TOKEN_SECRET=SUPERSECRET
+TOKEN_EXPIRATION=15d
+TOKEN_REFRESH_EXPIRATION=90d
+APP_BASE_URL=http://localhost:4343