From 13f2c1d8e6a387de7f41822deac937549407b24e Mon Sep 17 00:00:00 2001
From: Refringe <brownelltyler@gmail.com>
Date: Sat, 2 Mar 2024 13:59:49 -0500
Subject: [PATCH] Update build.yaml and Dockerfile

---
 .gitea/workflows/build.yaml | 23 +++++++++++++++++------
 Dockerfile                  | 12 ++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index ab0318a..152f3d6 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -10,13 +10,14 @@ jobs:
   Build Server:
     runs-on: ubuntu-latest
     container:
-      image: refringe/spt-build-environment:1.0.5
+      image: refringe/spt-build-server:0.0.1
     steps:
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        node-version: '20.10.0'
+    - name: Print Versions
+      run: |
+        echo "Git version:" && git --version
+        echo "Git LFS version:" && git-lfs --version
+        echo "Node.js version:" && node --version
+        echo "NPM version:" && npm --version
 
     - name: Server Cache
       id: server-cache
@@ -36,6 +37,16 @@ jobs:
         cd /workspace/refringe/Build/server
         git lfs pull && git lfs ls-files
 
+    - name: Install Server Dependencies
+      run: |
+        cd /workspace/refringe/Build/server
+        npm install
+
+    - name: Install Server Dependencies
+      run: |
+        cd /workspace/refringe/Build/server
+        npm build:bleeding
+
 # find build type
 # npm install
 # npm build:type
diff --git a/Dockerfile b/Dockerfile
index 0280ff2..04eada3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,11 @@
-# Use the .NET 6.0 SDK base image
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+# Use the Node v20.10.0 base image
+FROM node:20.10.0
 
-# Install necessary tools and dependencies (git, git-lfs, nodejs, 7-Zip, zstd)
+# Install necessary tools and dependencies (git, git-lfs, and zstd)
 RUN apt-get update && \
-    apt-get install -y git git-lfs nodejs p7zip-full zstd && \
+    apt-get install -y git git-lfs zstd && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Set the working directory to /code
 WORKDIR /code
-
-# Add a non-root user for running the build
-RUN useradd -m builder
-USER builder