From 04237c6ba022dc13dc075b1f9f5117762fc968cb Mon Sep 17 00:00:00 2001
From: ikiris <4852950+ikiris@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:33:02 -0500
Subject: [PATCH] Satisfactory 1.0 Port changes (#258)

* Remove unused ports

---------

Co-authored-by: Robert Thomas <31854736+wolveix@users.noreply.github.com>
---
 Dockerfile               |  5 ++---
 README.md                |  8 ++------
 cluster/service.yaml     | 15 +++++----------
 cluster/statefulset.yaml |  9 +++------
 docker-compose.yml       |  3 +--
 run.sh                   |  2 +-
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 54e1075..c742dc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM steamcmd/steamcmd:ubuntu-24
 
+# hadolint ignore=DL3008
 RUN set -x \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y gosu xdg-user-dirs --no-install-recommends\
@@ -31,16 +32,14 @@ ENV AUTOPAUSE="true" \
     PGID="1000" \
     PUID="1000" \
     ROOTLESS="false" \
-    SERVERBEACONPORT="15000" \
     SERVERGAMEPORT="7777" \
     SERVERIP="0.0.0.0" \
-    SERVERQUERYPORT="15777" \
     SERVERSTREAMING="true" \
     SKIPUPDATE="false" \
     STEAMAPPID="1690800" \
     STEAMBETA="false" \
     TIMEOUT="30"
 
-EXPOSE 7777/udp 15000/udp 15777/udp
+EXPOSE 7777/udp 7777/tcp
 
 ENTRYPOINT [ "/init.sh" ]
diff --git a/README.md b/README.md
index 8ff4354..4e83e70 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,7 @@ docker run \
 --memory-reservation=4G \
 --memory 6G \
 --publish 7777:7777/udp \
---publish 15000:15000/udp \
---publish 15777:15777/udp \
+--publish 7777:7777/tcp \
 wolveix/satisfactory-server:latest
 ```
 
@@ -72,8 +71,7 @@ services:
         image: 'wolveix/satisfactory-server:latest'
         ports:
             - '7777:7777/udp'
-            - '15000:15000/udp'
-            - '15777:15777/udp'
+            - '7777:7777/tcp'
         volumes:
             - '/path/to/config:/config'
         environment:
@@ -123,10 +121,8 @@ helm install satisfactory k8s-at-home/satisfactory -f values.yaml
 | `PGID`                  |  `1000`   | set the group ID of the user the server will run as |
 | `PUID`                  |  `1000`   | set the user ID of the user the server will run as  |
 | `ROOTLESS`              |  `false`  | run the container as a non-root user                |
-| `SERVERBEACONPORT`      |  `15000`  | set the game's beacon port                          |
 | `SERVERGAMEPORT`        |  `7777`   | set the game's port                                 |
 | `SERVERIP`              | `0.0.0.0` | set the game's ip (usually not needed)              |
-| `SERVERQUERYPORT`       |  `15777`  | set the game's query port                           |
 | `SERVERSTREAMING`       |  `true`   | toggle whether the game utilizes asset streaming    |
 | `SKIPUPDATE`            |  `false`  | avoid updating the game on container start/restart  |
 | `STEAMBETA`             |  `false`  | set experimental game version                       |
diff --git a/cluster/service.yaml b/cluster/service.yaml
index e8c4db1..369a6b4 100644
--- a/cluster/service.yaml
+++ b/cluster/service.yaml
@@ -8,20 +8,15 @@ metadata:
 spec:
   type: NodePort
   ports:
-  - port: 15777
-    nodePort: 15777
-    protocol: UDP
-    name: "query"
-    targetPort: "query"
-  - port: 15000
-    nodePort: 15000
-    protocol: UDP
-    name: "beacon"
-    targetPort: "beacon"
   - port: 7777
     nodePort: 7777
     protocol: UDP
     name: "game"
     targetPort: "game"
+  - port: 7777
+    nodePort: 7777
+    protocol: TCP
+    name: "gameTCP"
+    targetPort: "gameTCP"
   selector:
     app: satisfactory
diff --git a/cluster/statefulset.yaml b/cluster/statefulset.yaml
index c431da5..196fb41 100644
--- a/cluster/statefulset.yaml
+++ b/cluster/statefulset.yaml
@@ -31,12 +31,9 @@ spec:
           - name: STEAMBETA
             value: "false"
         ports:
-        - containerPort: 15777
-          name: "query"
-          protocol: UDP
-        - containerPort: 15000
-          name: "beacon"
-          protocol: UDP
+        - containerPort: 7777
+          name: "gameTCP"
+          protocol: TCP
         - containerPort: 7777
           name: "game"
           protocol: UDP
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c21aaf..d97da67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,7 @@ services:
     image: 'wolveix/satisfactory-server:latest'
     ports:
       - '7777:7777/udp'
-      - '15000:15000/udp'
-      - '15777:15777/udp'
+      - '7777:7777/tcp'
     volumes:
       - '/path/to/config:/config'
     environment:
diff --git a/run.sh b/run.sh
index c309023..4b59c2f 100755
--- a/run.sh
+++ b/run.sh
@@ -185,4 +185,4 @@ fi
 
 cd /config/gamefiles || exit 1
 
-exec ./FactoryServer.sh -Port="$SERVERGAMEPORT" -BeaconPort="$SERVERBEACONPORT" -ServerQueryPort="$SERVERQUERYPORT" $SERVERIP "$@"
+exec ./FactoryServer.sh -Port="$SERVERGAMEPORT" $SERVERIP "$@"