From a3c1dd006919ddb5c7bf4b18518b8ed87ffae59d Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Thu, 25 Jan 2024 21:45:05 -0500 Subject: [PATCH 1/6] Added description for server --- Dockerfile | 3 ++- README.md | 1 + docker-compose.yml | 1 + k8s/configmap.yaml | 1 + scripts/start.sh | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 69b72e6..e210f6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,8 @@ ENV PORT= \ RCON_ENABLED=true \ RCON_PORT=25575 \ QUERY_PORT=27015 \ - TZ=UTC + TZ=UTC \ + SERVER_DESCRIPTION= COPY ./scripts/* /home/steam/server/ RUN chmod +x /home/steam/server/init.sh /home/steam/server/start.sh /home/steam/server/backup.sh diff --git a/README.md b/README.md index 2af76b1..6fc39ff 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ It is highly recommended you set the following environment values before startin | PUBLIC_IP | You can manually specify the global IP address of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | x.x.x.x | | PUBLIC_PORT | You can manually specify the port number of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | 1024-65535 | | SERVER_NAME | A name for your community server | | "string" | +| SERVER_DESCRIPTION | A description for your server | | "string" | SERVER_PASSWORD | Secure your community server with a password | | "string" | | ADMIN_PASSWORD | Secure administration access in the server with a password | | "string" | | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | diff --git a/docker-compose.yml b/docker-compose.yml index 21aff67..fd6c0d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,5 +20,6 @@ services: - COMMUNITY=false # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD! # Enable the environment variables below if you have COMMUNITY=true # - SERVER_NAME="World of Pals" + - SERVER_DESCRIPTION="Hello World" volumes: - ./palworld:/palworld/ diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml index 266b340..dd34b8c 100644 --- a/k8s/configmap.yaml +++ b/k8s/configmap.yaml @@ -14,6 +14,7 @@ data: # Enable the environment variables below if you have COMMUNITY=true # SERVER_PASSWORD: "yourServerPassword" SERVER_NAME: "Server_Name" # Note, it seems spaces are not supported, so use underlines. + SERVER_DESCRIPTION: "" --- apiVersion: v1 kind: ConfigMap diff --git a/scripts/start.sh b/scripts/start.sh index 9159076..01abae6 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -26,6 +26,10 @@ if [ -n "${SERVER_NAME}" ]; then STARTCOMMAND="${STARTCOMMAND} -servername=${SERVER_NAME}" fi +if [ -n "${SERVER_DESCRIPTION}" ]; then + STARTCOMMAND="${STARTCOMMAND} -serverdescription=${SERVER_DESCRIPTION}" +fi + if [ -n "${SERVER_PASSWORD}" ]; then STARTCOMMAND="${STARTCOMMAND} -serverpassword=${SERVER_PASSWORD}" fi From b58dee572c23b39d7f5632c4860d48013605ae35 Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Thu, 25 Jan 2024 21:52:22 -0500 Subject: [PATCH 2/6] Added ending pipe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6fc39ff..752f263 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ It is highly recommended you set the following environment values before startin | PUBLIC_IP | You can manually specify the global IP address of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | x.x.x.x | | PUBLIC_PORT | You can manually specify the port number of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | 1024-65535 | | SERVER_NAME | A name for your community server | | "string" | -| SERVER_DESCRIPTION | A description for your server | | "string" +| SERVER_DESCRIPTION | A description for your server | | "string" | | SERVER_PASSWORD | Secure your community server with a password | | "string" | | ADMIN_PASSWORD | Secure administration access in the server with a password | | "string" | | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | From 5d028c8746752381bbe639ccc28060b72b7de328 Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Fri, 26 Jan 2024 08:31:57 -0500 Subject: [PATCH 3/6] Fixed changed from merge --- README.md | 2 +- k8s/configmap.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 3dd9b7a..2b66ee0 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ It is highly recommended you set the following environment values before startin | COMMUNITY | Whether or not the server shows up in the community server browser (USE WITH SERVER_PASSWORD) | false | true/false | | PUBLIC_IP | You can manually specify the global IP address of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | x.x.x.x | | PUBLIC_PORT | You can manually specify the port number of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | 1024-65535 | -| SERVER_NAME | A name for your server | | "string" | +| SERVER_NAME | A name for your server | | "string" | | SERVER_PASSWORD | Secure your community server with a password | | "string" | | ADMIN_PASSWORD | Secure administration access in the server with a password | | "string" | | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml index 8b0b6d2..13eb262 100644 --- a/k8s/configmap.yaml +++ b/k8s/configmap.yaml @@ -13,8 +13,6 @@ data: RCON_PORT: "25575" TZ: UTC COMMUNITY: "false" # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD! - # Enable the environment variables below if you have COMMUNITY=true - # SERVER_PASSWORD: "yourServerPassword" SERVER_NAME: "World of Pals" SERVER_DESCRIPTION: "" --- From c04114371c74bcb7d7b37b0d4671fc42457a6b75 Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Fri, 26 Jan 2024 08:33:19 -0500 Subject: [PATCH 4/6] Reverted to old spacing for server name description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b66ee0..a03ff57 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ It is highly recommended you set the following environment values before startin | COMMUNITY | Whether or not the server shows up in the community server browser (USE WITH SERVER_PASSWORD) | false | true/false | | PUBLIC_IP | You can manually specify the global IP address of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | x.x.x.x | | PUBLIC_PORT | You can manually specify the port number of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | 1024-65535 | -| SERVER_NAME | A name for your server | | "string" | +| SERVER_NAME | A name for your server | | "string" | | | SERVER_PASSWORD | Secure your community server with a password | | "string" | | ADMIN_PASSWORD | Secure administration access in the server with a password | | "string" | | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | From 08ec26b3f2f1bc05e47588e9615070d093168a75 Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Fri, 26 Jan 2024 08:36:09 -0500 Subject: [PATCH 5/6] Changed spacing to match current version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a03ff57..8103b01 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ It is highly recommended you set the following environment values before startin | COMMUNITY | Whether or not the server shows up in the community server browser (USE WITH SERVER_PASSWORD) | false | true/false | | PUBLIC_IP | You can manually specify the global IP address of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | x.x.x.x | | PUBLIC_PORT | You can manually specify the port number of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. | | 1024-65535 | -| SERVER_NAME | A name for your server | | "string" | | +| SERVER_NAME | A name for your server | | "string" | | SERVER_PASSWORD | Secure your community server with a password | | "string" | | ADMIN_PASSWORD | Secure administration access in the server with a password | | "string" | | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | From 3eef1253579e09175e8304f1d1e3e31250627292 Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Fri, 26 Jan 2024 12:26:11 -0500 Subject: [PATCH 6/6] Updated to array style command --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 5cd149e..c9cb3da 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -27,7 +27,7 @@ if [ -n "${SERVER_NAME}" ]; then fi if [ -n "${SERVER_DESCRIPTION}" ]; then - STARTCOMMAND="${STARTCOMMAND} -serverdescription=${SERVER_DESCRIPTION}" + STARTCOMMAND+=("-serverdescription=${SERVER_DESCRIPTION}") fi if [ -n "${SERVER_PASSWORD}" ]; then