From 6c7ebb345a8fd88283616c8f753f8a6fef6dcdad Mon Sep 17 00:00:00 2001
From: Flemming Petersen <mail@flemming-petersen.de>
Date: Wed, 15 Dec 2021 16:01:30 +0100
Subject: [PATCH] Make use of internal docker networks unifi database name

---
 .env.example        |  4 ++--
 docker-compose.yaml | 26 +++++++++++++++++++-------
 scripts/start.sh    |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index a27d0d6..46eda2a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-# Set this value to 'agree' to accept our license: 
+# Set this value to 'agree' to accept our license:
 # LICENSE: https://github.com/calendso/calendso/blob/main/LICENSE
 #
 # Summary of terms:
@@ -14,7 +14,7 @@ NEXT_PUBLIC_APP_URL=http://localhost:3000
 POSTGRES_USER=unicorn_user
 POSTGRES_PASSWORD=magical_password
 POSTGRES_DB=calendso
-DATABASE_HOST=db:5432
+DATABASE_HOST=database:5432
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
 GOOGLE_API_CREDENTIALS={}
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 47aa0eb..c023705 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,14 +1,23 @@
 # Use postgres/example user/password credentials
 version: '3.1'
+
+volumes:
+  database-data:
+
+networks:
+  stack:
+    external: false
+
 services:
-  db:
+  database:
     image: postgres
     restart: always
     volumes:
       - database-data:/var/lib/postgresql/data/
     env_file: .env
-    ports:
-      - 5432:5432
+    networks:
+      - stack
+
   calendso:
     build:
       context: .
@@ -18,28 +27,31 @@ services:
         - NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
     image: calendso/docker
     restart: always
+    networks:
+      - stack
     ports:
       - 3000:3000
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
     depends_on:
-      - db
+      - database
+
 # Optional use of Prisma Studio. In production, comment out or remove the section below to prevent unwanted access to your database.
   studio:
     image: calendso/docker
     restart: always
+    networks:
+      - stack
     ports:
       - 5555:5555
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
     depends_on:
-      - db
+      - database
     command:
       - npx
       - prisma
       - studio
 # END SECTION: Optional use of Prisma Studio.
-volumes:
-  database-data:
diff --git a/scripts/start.sh b/scripts/start.sh
index 031c0f2..dc84684 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -x
 
-/app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "db is up"
+/app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
 npx prisma migrate deploy
 yarn start