From 590221f0c409080b3948f57b477c69d3ba1c442d Mon Sep 17 00:00:00 2001 From: alfi0812 <43101280+alfi0812@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:12:37 +0100 Subject: [PATCH] fix(jts3servermod): Update Container which includes fixes for entrypoint.sh (#18734) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` **Description** ⚒️ Removes the need for tinkering with the entrypoint.sh **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/incubator/jts3servermod/Chart.yaml | 2 +- .../jts3servermod/docs/installation.md | 38 ------------------- charts/incubator/jts3servermod/values.yaml | 24 +----------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 charts/incubator/jts3servermod/docs/installation.md diff --git a/charts/incubator/jts3servermod/Chart.yaml b/charts/incubator/jts3servermod/Chart.yaml index 0f9285998d0..d08782acab3 100644 --- a/charts/incubator/jts3servermod/Chart.yaml +++ b/charts/incubator/jts3servermod/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/jts3servermod - https://hub.docker.com/r/nickslowinski/jts3servermod-dockerized type: application -version: 0.0.1 +version: 0.0.2 diff --git a/charts/incubator/jts3servermod/docs/installation.md b/charts/incubator/jts3servermod/docs/installation.md deleted file mode 100644 index 2de8e0fe54c..00000000000 --- a/charts/incubator/jts3servermod/docs/installation.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: Installation Guide ---- - -## App Installation - -### Networking - -This App isn't using ports. - -#### Configuration - -The configuration files have to be manually uploaded to the config storage. - -1\. Please go to [JTS3ServerMod](https://www.stefan1200.de/dlrequest.php?file=jts3servermod&type=.zip) to download the Bot. - -2\. Extract the config folder on your pc. - -3\. Change the following files - -- JTS3ServerMod_InstanceManager.cfg -- JTS3ServerMod_server_example.cfg - -4\. Also change the /server1 files for each function you've selected in JTS3ServerMod_server_example.cfg - -5\. Now stop the App if not already done. - -6\. [Mount the PVC](https://truecharts.org/manual/SCALE/guides/pvc-access/) - -7\. And upload the config folder you've extracted and modified. - -8\. Afterwards remove the Mount again and start the app. - -9\. The Bot should now start correctly and should connect to your teamspeak-server - -#### Documentation - -More Documentation for the App can be found on this [Website](https://www.stefan1200.de/documentation/jts3servermod/readme.html) diff --git a/charts/incubator/jts3servermod/values.yaml b/charts/incubator/jts3servermod/values.yaml index 221b7ec2d61..b73a949dcad 100644 --- a/charts/incubator/jts3servermod/values.yaml +++ b/charts/incubator/jts3servermod/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/galexrt/jts3servermod pullPolicy: IfNotPresent - tag: main@sha256:fb8fb98f77b3dc83c44bf41dcfa74cb7f6c45972a954f856d5cc0fe2c7282a85 + tag: v20240301-172535-248@sha256:30cf3a8e043b6c27721da1a28987aaadbc6c482cccd90836b0d821cf820facaa securityContext: container: @@ -9,21 +9,6 @@ securityContext: runAsUser: 3000 runAsGroup: 3000 -configmap: - entrypoint: - enabled: true - data: - # https://github.com/galexrt/container-jts3servermod/pull/5 - entrypoint.sh: | - #!/bin/bash - JTS3_LOG="${JTS3_LOG:-JTS3ServerMod_InstanceManager.cfg}" - if [ ! "$(ls -A "$JTS3_DIR/config/")" ]; then - echo "ENTRYPOINT: JTS3 Config volume is empty, copying default files to volume" - cp -ar "$JTS3_DIR"/default_config/* "$JTS3_DIR/config/" - fi - cd "$JTS3_DIR" || { echo "ENTRYPOINT: Failed to enter JTS3_DIR ($JTS3_DIR), exiting"; exit 1; } - exec java "$JTS3_JAVA_ARGS" -jar "$JTS3_DIR/JTS3ServerMod.jar" -log "$JTS3_LOG" "$@" - workload: main: podSpec: @@ -47,13 +32,6 @@ service: enabled: false persistence: - entrypoint: - enabled: true - objectName: entrypoint - type: configmap - defaultMode: "0755" - mountPath: /entrypoint.sh - subPath: entrypoint.sh config: enabled: true mountPath: "/jts3servermod/config"