From 6ca688f01e7a32034529281dd4d425b1cdcb5f2d Mon Sep 17 00:00:00 2001
From: Jack Andrews <45759583+potts99@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:24:37 +0000
Subject: [PATCH 1/2] Update README.md (#179)

---
 README.md | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4b06a8f22..0b069a591 100644
--- a/README.md
+++ b/README.md
@@ -45,31 +45,45 @@ version: "3.1"
 
 services:
   postgres:
+    profiles:
+      - prod
+      - dev
+      - test
     container_name: postgres
     image: postgres:latest
     restart: always
     volumes:
-      - ./docker-data/db:/data/db
-    environment: 
+      - pgdata:/var/lib/postgresql/data
+    environment:
       POSTGRES_USER: peppermint
       POSTGRES_PASSWORD: 1234
       POSTGRES_DB: peppermint
 
-  client:
+  peppermint:
+    profiles:
+      - prod
     container_name: peppermint
     image: pepperlabs/peppermint:latest
     ports:
-      - 5000:5000
-    restart: on-failure
+      - 5001:5001
+    restart: always
     depends_on:
       - postgres
+    healthcheck:
+      test: ["CMD", "sh", "-c", "wget --spider $$BASE_URL"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     environment:
-      PORT: 5000
+      PORT: 5001
       DB_USERNAME: peppermint
       DB_PASSWORD: 1234
-      DB_HOST: 'postgres'
-      BASE_URL: "http://localhost:5000"
+      DB_HOST: postgres
+      SECRET: 'peppermint4life'
+      
 
+volumes:
+ pgdata:
 ```
 
 Once this is completed then you can go to your base_url which was added to the compose file and login.

From 4e7a895cc91870be39beec6327302eef969a2930 Mon Sep 17 00:00:00 2001
From: Jack Andrews <45759583+potts99@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:34:34 +0000
Subject: [PATCH 2/2] Next (#180)

* ci

* ci

* ci working

* update compose
---
 .github/workflows/dev.yml | 18 +++++-------------
 docker-compose.yml        | 27 +++++++++++----------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 39807c8aa..2f91fe85f 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -2,15 +2,12 @@ name: Dev Client Build
 
 on:
   push:
-    branches: 
-        - master
+    branches:
+      - next
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: /apps/client
     steps:
       - name: Get current time
         uses: 1466587594/get-current-time@v2
@@ -26,22 +23,17 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with: 
-          context: ./apps/client
-          file: ./apps/client/Dockerfile
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }} 
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./apps/client
-          file: ./apps/client/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm
           push: true
           tags: |
-            pepperlabs/peppermint:dev
\ No newline at end of file
+            pepperlabs/peppermint:dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 638dc6bcb..0ff3b8ae6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,12 @@
 version: "3.1"
 
 services:
-  postgres:
-    profiles:
-      - prod
-      - dev
-      - test
-    container_name: postgres
+  peppermint_postgres:
+    container_name: peppermint_postgres
     image: postgres:latest
     restart: always
+    ports:
+      - 5432:5432
     volumes:
       - pgdata:/var/lib/postgresql/data
     environment:
@@ -17,27 +15,24 @@ services:
       POSTGRES_DB: peppermint
 
   peppermint:
-    profiles:
-      - prod
     container_name: peppermint
     image: pepperlabs/peppermint:latest
     ports:
-      - 5001:5001
+      - 3000:3000
+      - 5003:5003
     restart: always
     depends_on:
-      - postgres
+      - peppermint_postgres
     healthcheck:
       test: ["CMD", "sh", "-c", "wget --spider $$BASE_URL"]
       interval: 30s
       timeout: 10s
       retries: 3
     environment:
-      PORT: 5001
-      DB_USERNAME: peppermint
-      DB_PASSWORD: 1234
-      DB_HOST: postgres
-      SECRET: 'peppermint4life'
-      
+      DB_USERNAME: "peppermint"
+      DB_PASSWORD: "1234"
+      DB_HOST: "peppermint_postgres"
+      API_PORT: 5003
 
 volumes:
  pgdata:
\ No newline at end of file