Fixed envs

jhaworth21 · Nov 17, 2024 · 9c6e18e · 9c6e18e
1 parent 0abe652
commit 9c6e18e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+deployment/.backend.secrets.env
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -10,4 +10,4 @@ COPY . .
 
 EXPOSE 3000
 
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "deploy"]
diff --git a/backend/package.json b/backend/package.json
@@ -4,7 +4,8 @@
   "main": "app.js",
   "scripts": {
     "dev": "nodemon --env-file=cfg/.env app.js",
-    "start": "node --env-file=cfg/.env app.js"
+    "start": "node --env-file=cfg/.env app.js",
+    "deploy": "node app.js"
   },
   "author": "",
   "license": "ISC",

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3.8'
+services:
+  frontend:
+    image: ghcr.io/jhaworth21/hacksheffield-9/frontend:latest
+    ports:
+      - "6002:5173"
+#        - "5173:6002"
+
+  backend:
+    image: ghcr.io/jhaworth21/hacksheffield-9/backend:latest
+    ports:
+        - "3000:6001"
+    env_file:
+      - .backend.secrets.env
+    environment:
+      - DEPLOYED=true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ COPY . .

		EXPOSE 3000

		CMD ["npm", "run", "start"]
		CMD ["npm", "run", "deploy"]