moved to podman env var rather than .env

.github/workflows/main.yml

@@ -33,4 +33,6 @@ jobs:
 
       # Connects to your server via ssh and runs the deploy bash script
       - name: Run Deploy Script
-        run: ssh -i ~/.ssh/id_rsa prod@${{secrets.IP_ADDRESS}} sh portfolio/portfolio-deploy.sh
+        run: |
+          ssh -i ~/.ssh/id_rsa prod@${{secrets.IP_ADDRESS}} sh deploy.sh portfolio-client
+          ssh -i ~/.ssh/id_rsa prod@${{secrets.IP_ADDRESS}} sh deploy.sh portfolio-server

README.md

@@ -18,21 +18,23 @@ See:
 <h4>Development Environment</h4>
 
 ```
-git clone https://github.com/quaxlyqueen/portfolio
+git clone https://github.com/joshashtondev/portfolio
-cd portfolio
+cd portfolio/server
-npm install
 node src/server.js &
+cd ../client
+npm install
 npm start
 ```
 
 <h4>Production Environment</h4>
 
 ```
-git clone https://github.com/quaxlyqueen/portfolio
+git clone https://github.com/joshashtondev/portfolio
-cd portfolio
+cd portfolio/server
+node src/server.js &
+cd ../client
 npm run build
 cd dist
-node ../src/server.js &
 serve -s
 ```
 
@@ -91,7 +93,7 @@ serve -s
 - [X] CI/CD (v.0.0.2)
 - [ ] Security:
   - [ ] Separate user for self-hosting, with reduced permissions. (v.0.0.2)
-  - [ ] Dockerize (v.0.0.2)
+  - [x] Dockerize (v.0.0.2)
 - [ ] .down-indicator popup text on hover, "scroll down to see my projects!"
 - [ ] Rewrite CSS into components/modules (v.0.0.2)
 - [ ] Read in data for portfolio a plain text files. (v.0.0.2)

api/Containerfile

@@ -2,7 +2,7 @@ FROM node:18-alpine
 
 WORKDIR /app
 
-COPY package.json./ /app
+COPY package.json /app
 
 RUN npm install
 

api/package.json

@@ -1,6 +1,7 @@
 {
   "name": "Portfolio Email Server",
   "version": "0.0.1",
+  "type": "module",
   "scripts": {
     "start": "node server.js"
   },

api/src/server.js

@@ -1,8 +1,6 @@
 import express from "express";
 import cors from "cors";
 import postmark from "postmark";
-import * as dotenv from 'dotenv';
-dotenv.config();
 
 const app = express();
 const port = 3001; // Example port

client/Containerfile

@@ -5,17 +5,20 @@ FROM node:18-alpine
 WORKDIR /app
 
 # Copy package.json and package-lock.json
+COPY index.html /app
 COPY package.json /app
 
 # Install dependencies
 RUN npm install
 
 # Copy the rest of the React app
-COPY src/. /app
+COPY src/. /app/src/
 
 # Build the React app for production
 RUN npm run build
 
+COPY public/images/. /app/dist/images/
+
 # Expose the port your React app will run on (usually 3000)
 EXPOSE 3000
 

compose.yaml

@@ -0,0 +1,18 @@
+---
+
+services:
+  portfolio:
+    build: $HOME/portfolio/client
+    container_name: portfolio
+    restart: unless-stopped
+    ports:
+      - "3000:3000"
+    depends_on:
+      - portfolio_api
+
+  portfolio_api:
+    build: $HOME/portfolio/api
+    container_name: portfolio_api
+    restart: unless-stopped
+    ports:
+      - "3001:3001"

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "portfolio",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}