Merge pull request #183 from Peppermint-Lab/next

Next

Author: potts99

README.md

@@ -46,10 +46,6 @@ version: "3.1"
 services:
   peppermint_postgres:
     container_name: peppermint_postgres
-    profiles:
-      - prod
-      - dev
-      - test
     image: postgres:latest
     restart: always
     ports:
@@ -70,10 +66,6 @@ services:
     restart: always
     depends_on:
       - peppermint_postgres
-    profiles:
-      - prod
-    depends_on:
-      - postgres
     healthcheck:
       test: ["CMD", "sh", "-c", "wget --spider $$BASE_URL"]
       interval: 30s
@@ -84,9 +76,11 @@ services:
       DB_PASSWORD: "1234"
       DB_HOST: "peppermint_postgres"
       SECRET: 'peppermint4life'
-      
+      API_URL: "http://localhost:5003"
+
 volumes:
  pgdata:
+
 ```
 
 Once this is completed then you can go to your base_url which was added to the compose file and login.

apps/client/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
-    "start": "next start"
+    "start": "next start",
+    "docker": "next build && next start"
   },
   "dependencies": {
     "@headlessui/react": "^1.4.2",

docker-compose.dev.yml

@@ -32,6 +32,7 @@ services:
       DB_USERNAME: "peppermint"
       DB_PASSWORD: "1234"
       DB_HOST: "peppermint_postgres"
+      SECRET: 'peppermint4life'
       API_URL: "http://localhost:5003"
 
 volumes:

docker-compose.local.yml

@@ -19,7 +19,7 @@ services:
     build: "."
     ports:
       - 3000:3000
-      - 5003:5003
+      - 5001:5003
     restart: always
     depends_on:
       - peppermint_postgres
@@ -32,7 +32,8 @@ services:
       DB_USERNAME: "peppermint"
       DB_PASSWORD: "1234"
       DB_HOST: "peppermint_postgres"
-      API_URL: "http://localhost:5003"
+      SECRET: 'peppermint4life'
+      API_URL: "http://localhost:5001"
 
 volumes:
  pgdata:

docker-compose.yml

@@ -32,6 +32,7 @@ services:
       DB_USERNAME: "peppermint"
       DB_PASSWORD: "1234"
       DB_HOST: "peppermint_postgres"
+      SECRET: 'peppermint4life'
       API_URL: "http://localhost:5003"
 
 volumes:

dockerfile

@@ -11,7 +11,6 @@ COPY apps/api/package*.json ./apps/api/
 COPY apps/client/package*.json ./apps/client/
 COPY ./ecosystem.config.js ./ecosystem.config.js
 
-
 RUN npm i -g prisma
 RUN npm i -g typescript@latest -g --force 
 
@@ -23,7 +22,7 @@ RUN cd apps/api && npm install --production
 RUN cd apps/api && npm i --save-dev @types/node && npm run build
 
 RUN cd apps/client && yarn install --production --ignore-scripts --prefer-offline --network-timeout 1000000
-RUN cd apps/client && yarn add --dev typescript @types/node --network-timeout 1000000 && yarn build
+RUN cd apps/client && yarn add --dev typescript @types/node --network-timeout 1000000
 
 FROM node:lts AS runner
 

ecosystem.config.js

@@ -2,7 +2,7 @@ module.exports = {
   apps: [
     {
       name: "client",
-      script: "npm run start",
+      script: "npm run docker",
       cwd: "apps/client",
       instances: "1",
       autorestart: true,