From cc9efe4577f24c3e839e57c2f04716a5e1d99977 Mon Sep 17 00:00:00 2001
From: Refringe <me@refringe.com>
Date: Fri, 8 Mar 2024 12:21:08 -0500
Subject: [PATCH] Back to two docker images; one for dotnet, one for node.

---
 .gitea/workflows/build.yaml              |  8 ++++----
 Dockerfile.launcher => Dockerfile.dotnet |  0
 Dockerfile.modules                       | 18 ------------------
 Dockerfile.server => Dockerfile.node     |  0
 README.md                                | 16 ++++++----------
 5 files changed, 10 insertions(+), 32 deletions(-)
 rename Dockerfile.launcher => Dockerfile.dotnet (100%)
 delete mode 100644 Dockerfile.modules
 rename Dockerfile.server => Dockerfile.node (100%)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index b4bc0e7..feb4977 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -43,7 +43,7 @@ jobs:
     if: needs.check-tag-exists.outputs.proceed == 'true'
     runs-on: ubuntu-latest
     container:
-      image: refringe/spt-build-server:1.0.0
+      image: refringe/spt-build-node:1.0.0
     outputs:
       build_type: ${{ steps.build-type.outputs.build_type }}
     steps:
@@ -137,7 +137,7 @@ jobs:
     if: needs.check-tag-exists.outputs.proceed == 'true'
     runs-on: ubuntu-latest
     container:
-      image: refringe/spt-build-modules:1.0.0
+      image: refringe/spt-build-dotnet:1.0.0
     outputs:
       client_version: ${{ steps.extract-client-version.outputs.client_version }}
     steps:
@@ -223,7 +223,7 @@ jobs:
     if: needs.check-tag-exists.outputs.proceed == 'true'
     runs-on: ubuntu-latest
     container:
-      image: refringe/spt-build-launcher:1.0.0
+      image: refringe/spt-build-dotnet:1.0.0
     steps:
     - name: Clone
       run: |
@@ -249,7 +249,7 @@ jobs:
     needs: [check-tag-exists, build-server, build-modules, build-launcher]
     runs-on: ubuntu-latest
     container:
-      image: refringe/spt-build-server:1.0.0
+      image: refringe/spt-build-node:1.0.0
     steps:
       - name: Clean Directory
         run: |
diff --git a/Dockerfile.launcher b/Dockerfile.dotnet
similarity index 100%
rename from Dockerfile.launcher
rename to Dockerfile.dotnet
diff --git a/Dockerfile.modules b/Dockerfile.modules
deleted file mode 100644
index d067c22..0000000
--- a/Dockerfile.modules
+++ /dev/null
@@ -1,18 +0,0 @@
-# Use the .NET 6.0 SDK base image
-FROM mcr.microsoft.com/dotnet/sdk:6.0
-
-# Configure Node.js v20 repository
-RUN curl -fsSL https://deb.nodesource.com/setup_20.10 | bash
-
-# Install necessary tools and dependencies
-#  - git (duh)
-#  - zstd (caching action dependancy)
-#  - wget (downloading module packages)
-#  - jq (fetching data from JSON files)
-#  - p7zip-full (extracting archives)
-#  - nodejs (artifact action dependancy)
-#  - tree (pretty print build directory structure)
-RUN apt-get update && \
-    apt-get install -y git zstd wget jq p7zip-full nodejs tree && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile.server b/Dockerfile.node
similarity index 100%
rename from Dockerfile.server
rename to Dockerfile.node
diff --git a/README.md b/README.md
index 8b0d70e..e7f1fb0 100644
--- a/README.md
+++ b/README.md
@@ -36,15 +36,11 @@ To build the Modules project, a link to a private repository is required for the
 Be sure to update the version number to the next available version before building and pushing the Docker images. you must be logged into Docker Desktop to push the images.
 
 ```
-# Build and push the spt-build-server Docker image to the Docker Hub
-docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.server .
-docker push refringe/spt-build-server --all-tags
+# Build and push the spt-build-node Docker image to the Docker Hub
+docker build -t refringe/spt-build-node:0.0.0 -t refringe/spt-build-node:latest -f Dockerfile.node .
+docker push refringe/spt-build-node --all-tags
 
-# Build and push the spt-build-modules Docker image to the Docker Hub
-docker build -t refringe/spt-build-modules:0.0.0 -t refringe/spt-build-modules:latest -f Dockerfile.modules .
-docker push refringe/spt-build-modules --all-tags
-
-# Build and push the spt-build-launcher Docker image to the Docker Hub
-docker build -t refringe/spt-build-launcher:0.0.0 -t refringe/spt-build-launcher:latest -f Dockerfile.launcher .
-docker push refringe/spt-build-launcher --all-tags
+# Build and push the spt-build-dotnet Docker image to the Docker Hub
+docker build -t refringe/spt-build-dotnet:0.0.0 -t refringe/spt-build-dotnet:latest -f Dockerfile.dotnet .
+docker push refringe/spt-build-dotnet --all-tags
 ```