Nightly2main-220925

Dockerfile → .docker/Dockerfile

@@ -29,7 +29,7 @@ COPY . ./
 COPY --from=frontend-builder /src/UIMod /src/UIMod
 
 # Build the server (embed will include UIMod/* at build time)
-RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o /out/StationeersServerControl ./server.go
+RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o /out/StationeersServerUI ./server.go
 
 ############
 # Runtime
@@ -47,20 +47,18 @@ RUN dpkg --add-architecture i386 \
     ca-certificates \
     locales \
     lib32gcc-s1 \
-    file \
+   file \
  && rm -rf /var/lib/apt/lists/*
 
-RUN useradd -m -d /app -s /bin/sh app
-
 # Copy compiled binary and license
-COPY --from=go-builder /out/StationeersServerControl /usr/local/bin/StationeersServerControl
-COPY ./LICENSE /app/LICENSE
-RUN chmod +x /usr/local/bin/StationeersServerControl
-
-RUN chown -R app:app /app
+RUN mkdir -p /opt/SSUIBuildFiles
+COPY --from=go-builder /out/StationeersServerUI /opt/SSUIBuildFiles/StationeersServerUI
+COPY ./LICENSE /opt/SSUIBuildFiles/LICENSE
+COPY ./.docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /opt/SSUIBuildFiles/StationeersServerUI
+RUN chmod +x /entrypoint.sh
 
-USER app
 
 EXPOSE 8443/tcp 27016/udp 27015/udp
 
-ENTRYPOINT ["/usr/local/bin/StationeersServerControl"]
+ENTRYPOINT ["/entrypoint.sh"]

compose.yml → .docker/compose.yml

@@ -1,8 +1,12 @@
 services:
   stationeers-server:
     container_name: stationeers-server
-    build : .
+    build:
+      context: ..
+      dockerfile: ./.docker/Dockerfile
     image: stationeers-server-ui:latest
+    stdin_open: true
+    tty: true
     deploy:
       resources:
         limits:
@@ -18,14 +22,10 @@ services:
       - "27015:27015/udp"
       - "27015:27015/tcp"
     volumes:
-      # Persist app data between container restarts
       - app-data:/app
-      # Mount saves and config for easy access/editing outside the container
       - ./saves:/app/saves:rw
-      - ./UIMod/config:/app/UIMod/config:rw
-      - ./UIMod/tls:/app/UIMod/tls:rw
+      - ./UIMod:/app/UIMod:rw
     restart: unless-stopped
-    command: []
 
 volumes:
   app-data:

.docker/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+cp /opt/SSUIBuildFiles/StationeersServerUI /app/StationeersServerUI
+cp /opt/SSUIBuildFiles/LICENSE /app/LICENSE
+chmod +x /app/StationeersServerUI
+exec /app/StationeersServerUI "$@"

.github/workflows/ghcr-build-nightly.yaml

@@ -51,6 +51,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./.docker/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ghcr-build-release.yaml

@@ -50,6 +50,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./.docker/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -24,6 +24,7 @@ UIMod/tls/cert.pem
 UIMod/tls/key.pem
 steamapps/**
 steamcmd/**
+Steam/**
 rocketstation_BurstDebugInformation_DoNotShip/**
 StationeersServerControlv*
 UnityPlayer.so

.vscode/launch.json

@@ -19,6 +19,16 @@
             "program": "${workspaceFolder}/server.go",
             "console": "integratedTerminal",
             "showLog": false, // Hides some Go Debugger(Delve) log stuff that is not useful for debugging atm
+        },
+        {
+            "name": "Debug Go Server noSteamCMD noSvelte",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}/server.go",
+            "console": "integratedTerminal",
+            "showLog": false, // Hides some Go Debugger(Delve) log stuff that is not useful for debugging atm
+            "args": ["--NoSteamCMD"]
         }
     ]
 }

UIMod/onboard_bundled/twoboxform/twoboxform.js

@@ -138,6 +138,12 @@ document.addEventListener('DOMContentLoaded', () => {
 
             } else if (configField === "SaveInfo") {
                 const primaryValue = document.getElementById('primary-field').value.trim();
+                // If the world name contains a space, it's invalid 
+                if (primaryValue.includes(' ')) {
+                    showNotification('The world name cannot contain spaces!', 'error');
+                    hidePreloader();
+                    return; // Prevent submission
+                    }
                 const secondaryValue = document.getElementById('secondary-field').value.trim();
                 if (secondaryValue === '' || secondaryValue === document.getElementById('secondary-field').placeholder) {
                     showNotification('Please select a world type!', 'error');

UIMod/onboard_bundled/ui/index.html

@@ -107,7 +107,7 @@ <h3>
             <p>signature sentence</p>
             <p>JacksonTheMaster</p>
         </div>
-        <div class="info-notice">
+        <div class="info-notice" style="display: none;">
             <h3>
                 <span class="notice-icon">ℹ️</span>
                 Transitioning to SteamServerUI (click to expand)

server.go

@@ -37,13 +37,17 @@ var v1uiFS embed.FS
 func main() {
 	var wg sync.WaitGroup
 	logger.ConfigureConsole()
+	loader.ParseFlags()
+	loader.HandleSanityCheckFlag()
+	loader.SanityCheck(&wg)
+	wg.Wait()
+	logger.Main.Info("Initializing resources...")
+	loader.InitVirtFS(v1uiFS)
 	logger.Install.Info("Starting setup...")
 	loader.ReloadConfig() // Load the config file before starting the setup process
-	loader.LoadCmdArgs()
+	loader.HandleFlags()
 	setup.Install(&wg)
 	wg.Wait()
-	logger.Main.Debug("Initializing resources...")
-	loader.InitVirtFS(v1uiFS)
 	logger.Main.Debug("Initializing Backend...")
 	loader.InitBackend(&wg)
 	wg.Wait()

src/cli/runtimecommands.go

@@ -273,6 +273,8 @@ func supportPackage() {
 	delete(configMap, "users")
 	delete(configMap, "JwtKey")
 	delete(configMap, "AdminPassword")
+	delete(configMap, "ServerAuthSecret")
+	delete(configMap, "ServerPassword")
 	sanitizedConfig, err := json.MarshalIndent(configMap, "", "  ")
 	if err != nil {
 		logger.Core.Error("Failed to marshal sanitized config into support package")

src/config/config.go

@@ -11,7 +11,7 @@ import (
 
 var (
 	// All configuration variables can be found in vars.go
-	Version = "5.6.5"
+	Version = "5.6.6"
 	Branch  = "release"
 )
 

src/config/getters.go

@@ -487,3 +487,27 @@ func GetAllowAutoGameServerUpdates() bool {
 	defer ConfigMu.RUnlock()
 	return AllowAutoGameServerUpdates
 }
+
+func GetExtractedGameVersion() string {
+	ConfigMu.RLock()
+	defer ConfigMu.RUnlock()
+	return ExtractedGameVersion
+}
+
+func GetSkipSteamCMD() bool {
+	ConfigMu.RLock()
+	defer ConfigMu.RUnlock()
+	return SkipSteamCMD
+}
+
+func GetNoSanityCheck() bool {
+	ConfigMu.RLock()
+	defer ConfigMu.RUnlock()
+	return NoSanityCheck
+}
+
+func GetIsDockerContainer() bool {
+	ConfigMu.RLock()
+	defer ConfigMu.RUnlock()
+	return IsDockerContainer
+}

src/config/setters.go

@@ -38,6 +38,38 @@ func SetCurrentBranchBuildID(value string) error {
 	return nil
 }
 
+func SetExtractedGameVersion(value string) error {
+	ConfigMu.Lock()
+	defer ConfigMu.Unlock()
+
+	ExtractedGameVersion = value
+	return nil
+}
+
+func SetSkipSteamCMD(value bool) error {
+	ConfigMu.Lock()
+	defer ConfigMu.Unlock()
+
+	SkipSteamCMD = value
+	return nil
+}
+
+func SetIsDockerContainer(value bool) error {
+	ConfigMu.Lock()
+	defer ConfigMu.Unlock()
+
+	IsDockerContainer = value
+	return nil
+}
+
+func SetNoSanityCheck(value bool) error {
+	ConfigMu.Lock()
+	defer ConfigMu.Unlock()
+
+	NoSanityCheck = value
+	return nil
+}
+
 // ALL SETTERS BELOW THIS LINE ARE UNUSED AT THE MOMENT
 // ALL SETTERS BELOW THIS LINE ARE UNUSED AT THE MOMENT
 // ALL SETTERS BELOW THIS LINE ARE UNUSED AT THE MOMENT

src/config/vars.go

@@ -61,7 +61,16 @@ var (
 	LanguageSetting          string
 	AutoStartServerOnStartup bool
 	SSUIIdentifier           string
-	CurrentBranchBuildID     string // ONLY RUNTIME
+)
+
+// Runtime only variables
+
+var (
+	CurrentBranchBuildID string // ONLY RUNTIME
+	ExtractedGameVersion string // ONLY RUNTIME
+	SkipSteamCMD         bool   // ONLY RUNTIME
+	IsDockerContainer    bool   // ONLY RUNTIME
+	NoSanityCheck        bool   // ONLY RUNTIME
 )
 
 // Discord integration