aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrodokk <brodokk@brodokk.space>2021-11-17 00:27:31 +0100
committerbrodokk <brodokk@brodokk.space>2021-11-17 00:28:19 +0100
commit4ee4e69e049910609e2b18279e15d42bc473e65e (patch)
treeface83a11ca139b9af74549b2320d0d1bce6e68d
parentc8673ea34867ac9ab6e77e261b557c0c89cfc8b0 (diff)
downloadneosvr_docker-4ee4e69e049910609e2b18279e15d42bc473e65e.tar.xz
neosvr_docker-4ee4e69e049910609e2b18279e15d42bc473e65e.zip
Fix neosvr config file installation process
-rw-r--r--Dockerfile2
-rw-r--r--config.json_base (renamed from config/Config.json)0
-rw-r--r--docker-compose.yml1
-rw-r--r--entrypoint.sh10
4 files changed, 10 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 3925c4d..b5ab440 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,8 @@ ENV LANGUAGE 'en_US:en'
RUN ln -s /usr/games/steamcmd /usr/bin/steamcmd
+COPY config.json_base /config.json_base
+
ADD entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
diff --git a/config/Config.json b/config.json_base
index 3b47166..3b47166 100644
--- a/config/Config.json
+++ b/config.json_base
diff --git a/docker-compose.yml b/docker-compose.yml
index 804cee6..35de7e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,5 @@ services:
volumes:
- ./steam:/steam
- ./logs:/logs
- - ./config:/steam/740250/Config
stdin_open: true
tty: true
diff --git a/entrypoint.sh b/entrypoint.sh
index e4c1b80..2c02ea7 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -22,10 +22,16 @@ if [ -n "${INSTALL_APPS}" ]; then
IFS=$OLD_IFS
fi
-echo "setting up neos config from env"
-
+ORIGIN_CONFIG_PATH="config.json_base"
CONFIG_PATH='/steam/740250/Config/Config.json'
+if [[ -f "$ORIGIN_CONFIG_PATH" ]]; then
+ echo "Neos config file not found, setting it up..."
+ mv $ORIGIN_CONFIG_PATH $CONFIG_PATH
+fi
+
+echo "Setting up neos config from env"
+
cat $CONFIG_PATH | jq --arg u "${NEOSVR_USER}" '.loginCredential = $u' | jq --arg p "${NEOSVR_PWD}" '.loginPassword = $p' | sponge $CONFIG_PATH
arguments=$@