From 7da2232fbbc3da3b712d6ae0083efaa446874d15 Mon Sep 17 00:00:00 2001
From: Kyle Speight <Electr_stream@outlook.com>
Date: Sat, 30 May 2026 03:17:14 -0700
Subject: [PATCH] Update Dockerfile

---
 tarkov/v4.0.11/Dockerfile | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/tarkov/v4.0.11/Dockerfile b/tarkov/v4.0.11/Dockerfile
index 72329b5..6697865 100644
--- a/tarkov/v4.0.11/Dockerfile
+++ b/tarkov/v4.0.11/Dockerfile
@@ -1,9 +1,12 @@
-FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/2sharkystudios/yolks:ubuntu
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/2sharkystudios/base:ubuntu
 
 LABEL       author="Kyle Speight" maintainer="chillcog3142@proton.me"
 
 ENV         DEBIAN_FRONTEND=noninteractive
 
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container/
 
 RUN         apt-get update && apt-get install -y ca-certificates gnupg lsb-release wget curl \
             && rm -rf /var/lib/apt/lists/*
@@ -26,23 +29,14 @@ RUN         mkdir -p /etc/apt/keyrings \
 RUN         apt-get update && apt-get install -y git git-lfs iproute2 libgdiplus tini software-properties-common \
             && rm -rf /var/lib/apt/lists/*
 
-RUN         mkdir -p /workspace/ /build/ \
-            && cd /workspace \
-            && git clone https://github.com/2SharkyStudios/SPT-Server-Build.git /workspace/git \
+RUN         mkdir -p /home/container/git/ /home/container/build/ \
+            && cd /home/container/ \
+            && git clone https://github.com/2SharkyStudios/SPT-Server-Build.git /home/container/git \
             && cd /workspace/git/ \
             && git lfs pull \
-            && cd /workspace/git/SPTarkov.Server/ \
+            && cd /home/container/git/SPTarkov.Server/ \
             && dotnet restore \
-            && dotnet build -c Release -p:SptBuildType=RELEASE -p:SptVersion=4.0.11 \
-            && ls /home/container/ \
-            && rm -rf /workspace/ \
-            && mv /build/* /home/container/ 2>/dev/null || true \
-            && chown -R container:container /home/container/ \
-            && rm -rf /build/
-
-USER        container
-ENV         USER=container HOME=/home/container
-WORKDIR     /home/container/
+            && dotnet build -o /home/container/build/ -c Release -p:SptBuildType=RELEASE -p:SptVersion=4.0.11
 
 STOPSIGNAL SIGINT