From 49e52d8944af94fa68783f1a12cb86fad7346005 Mon Sep 17 00:00:00 2001
From: Logan Cusano <logan@simplestepsolutions.com>
Date: Sun, 28 Apr 2024 04:46:08 -0400
Subject: [PATCH] Add makefile for server and related action build test

---
 .gitea/workflows/DRBv3_tests.yaml | 14 +++-----------
 server/makefile                   | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 server/makefile

diff --git a/.gitea/workflows/DRBv3_tests.yaml b/.gitea/workflows/DRBv3_tests.yaml
index aef5ea9..485a3d8 100644
--- a/.gitea/workflows/DRBv3_tests.yaml
+++ b/.gitea/workflows/DRBv3_tests.yaml
@@ -13,7 +13,7 @@ env:
   MONGO_INITDB_ROOT_USERNAME: admin
   MONGO_INITDB_ROOT_PASSWORD: admin
   MONGO_INITDB_DATABASE: drb
-  SERVER_PORT: 6000
+  SERVER_PORT: 3000
   MONGO_URL: "mongodb://mongodb:27017/drb"
   TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
   TEST_CLIENT_TOKEN: ${{ secrets.TEST_CLIENT_TOKEN }}
@@ -36,16 +36,8 @@ jobs:
         with:
           node-version: '20'
 
-      - name: Install dependencies
-        working-directory: './server'
-        run: npm install
-
-      - name: Build Docker image
-        working-directory: './server'
-        run: docker build -t DRB-Server .
-
-      - name: Run Docker container
-        run: docker run -d --name drb -p 3000:3000 DRB-Server 
+      - name: Build Docker image and run container
+        run: make build && make run
 
       - name: Wait for server to start
         run: sleep 10
diff --git a/server/makefile b/server/makefile
new file mode 100644
index 0000000..d8741d2
--- /dev/null
+++ b/server/makefile
@@ -0,0 +1,20 @@
+# Define variables
+DOCKER_IMAGE_NAME := drb-server
+
+# Define targets and rules
+.PHONY: build run
+
+build:
+    @echo "Building Docker image..."
+    docker build -t $(DOCKER_IMAGE_NAME) ./server
+
+run:
+    @echo "Running Docker container..."
+    docker run -e NODE_ENV=${NODE_ENV} \
+               -e MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} \
+               -e MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} \
+               -e MONGO_INITDB_DATABASE=${MONGO_INITDB_DATABASE} \
+               -e SERVER_PORT=${SERVER_PORT} \
+               -e MONGO_URL=${MONGO_URL} \
+               -p ${SERVER_PORT}:${SERVER_PORT} \
+               $(DOCKER_IMAGE_NAME)
\ No newline at end of file