From 4e44f33204eef31c4d582673a8656f33e045e4fc Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 23 Aug 2023 19:31:31 +1000
Subject: [PATCH] prod yaml

---
 Server/common.yaml              |  9 +++++++++
 Server/docker-compose.PROD.yaml | 16 ++++++++++++++++
 Server/docker-compose.yaml      | 20 +++-----------------
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 Server/common.yaml
 create mode 100644 Server/docker-compose.PROD.yaml

diff --git a/Server/common.yaml b/Server/common.yaml
new file mode 100644
index 0000000..3167d7c
--- /dev/null
+++ b/Server/common.yaml
@@ -0,0 +1,9 @@
+services:
+    pg:
+        image: postgres:latest
+        environment:
+            POSTGRES_USER: '${POSTGRES_USER}'
+            POSTGRES_DB: '${POSTGRES_DB}'
+            POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
+        ports:
+            - '45432:5432'
diff --git a/Server/docker-compose.PROD.yaml b/Server/docker-compose.PROD.yaml
new file mode 100644
index 0000000..c9d01fe
--- /dev/null
+++ b/Server/docker-compose.PROD.yaml
@@ -0,0 +1,16 @@
+services:
+    pg:
+        extends:
+          file: common.yaml
+          service: pg
+
+    server:
+        ports:
+            - '40080:80'
+        depends_on:
+          - 'pg'
+        environment:
+            CONNECTIONSTRINGS__SPACERACE: "Server=pg;Port=5432;Database=${POSTGRES_DB};User Id=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}"
+        build:
+            context: .
+            dockerfile: ./Dockerfile
diff --git a/Server/docker-compose.yaml b/Server/docker-compose.yaml
index 8178adf..a89d960 100644
--- a/Server/docker-compose.yaml
+++ b/Server/docker-compose.yaml
@@ -1,22 +1,8 @@
 services:
     pg:
-        image: postgres:latest
-        environment:
-            POSTGRES_USER: '${POSTGRES_USER}'
-            POSTGRES_DB: '${POSTGRES_DB}'
-            POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
-        ports:
-            - '45432:5432'
-
-    # server:
-    #     ports:
-    #         - '40080:80'
-    #     environment:
-    #         CONNECTIONSTRINGS__SPACERACE: "Server=pg;Port=5432;Database=${POSTGRES_DB};User Id=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}"
-    #     build:
-    #         context: .
-    #         dockerfile: ./Dockerfile
-    #     command: dotnet watch
+        extends:
+          file: common.yaml
+          service: pg
 
     server:
         image: mcr.microsoft.com/dotnet/sdk:7.0