From a316bd8f9553dbdb1ca5d9f75bdc251db36cc8a0 Mon Sep 17 00:00:00 2001 From: Michael Reichenbach Date: Fri, 29 Mar 2019 12:11:42 +0100 Subject: [PATCH] fix(minecraft-server): filter env replacement file Environment variable replacement now only affects matching file types. Closes #299 --- build | 0 elasticsearch/Dockerfile | 0 elasticsearch/README.md | 0 elasticsearch/start | 0 gitblit/start.sh | 0 jekyll-github-pages/start.sh | 0 jenkins/download-and-start.sh | 0 kibana/Dockerfile | 0 kibana/start.sh | 0 logstash/Dockerfile | 0 minecraft-server/start | 0 minecraft-server/start-configuration | 0 minecraft-server/start-deployBukkitSpigot | 0 minecraft-server/start-deployFTB | 0 minecraft-server/start-deployForge | 0 minecraft-server/start-deployPaper | 0 minecraft-server/start-deploySpongeVanilla | 0 minecraft-server/start-deployVanilla | 0 minecraft-server/start-finalSetup01World | 0 minecraft-server/start-finalSetup02Modpack | 0 minecraft-server/start-finalSetup03Modconfig | 0 minecraft-server/start-finalSetup04ServerProperties | 0 minecraft-server/start-finalSetup05EnvVariables | 4 ++-- minecraft-server/start-minecraftFinalSetup | 0 titan-gremlin/Dockerfile | 0 titan-gremlin/start-gremlin.sh | 0 titandb/gremlin | 0 titandb/rexster | 0 ubuntu-openjdk-7/Dockerfile | 0 29 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 build mode change 100755 => 100644 elasticsearch/Dockerfile mode change 100755 => 100644 elasticsearch/README.md mode change 100755 => 100644 elasticsearch/start mode change 100755 => 100644 gitblit/start.sh mode change 100755 => 100644 jekyll-github-pages/start.sh mode change 100755 => 100644 jenkins/download-and-start.sh mode change 100755 => 100644 kibana/Dockerfile mode change 100755 => 100644 kibana/start.sh mode change 100755 => 100644 logstash/Dockerfile mode change 100755 => 100644 minecraft-server/start mode change 100755 => 100644 minecraft-server/start-configuration mode change 100755 => 100644 minecraft-server/start-deployBukkitSpigot mode change 100755 => 100644 minecraft-server/start-deployFTB mode change 100755 => 100644 minecraft-server/start-deployForge mode change 100755 => 100644 minecraft-server/start-deployPaper mode change 100755 => 100644 minecraft-server/start-deploySpongeVanilla mode change 100755 => 100644 minecraft-server/start-deployVanilla mode change 100755 => 100644 minecraft-server/start-finalSetup01World mode change 100755 => 100644 minecraft-server/start-finalSetup02Modpack mode change 100755 => 100644 minecraft-server/start-finalSetup03Modconfig mode change 100755 => 100644 minecraft-server/start-finalSetup04ServerProperties mode change 100755 => 100644 minecraft-server/start-minecraftFinalSetup mode change 100755 => 100644 titan-gremlin/Dockerfile mode change 100755 => 100644 titan-gremlin/start-gremlin.sh mode change 100755 => 100644 titandb/gremlin mode change 100755 => 100644 titandb/rexster mode change 100755 => 100644 ubuntu-openjdk-7/Dockerfile diff --git a/build b/build old mode 100755 new mode 100644 diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile old mode 100755 new mode 100644 diff --git a/elasticsearch/README.md b/elasticsearch/README.md old mode 100755 new mode 100644 diff --git a/elasticsearch/start b/elasticsearch/start old mode 100755 new mode 100644 diff --git a/gitblit/start.sh b/gitblit/start.sh old mode 100755 new mode 100644 diff --git a/jekyll-github-pages/start.sh b/jekyll-github-pages/start.sh old mode 100755 new mode 100644 diff --git a/jenkins/download-and-start.sh b/jenkins/download-and-start.sh old mode 100755 new mode 100644 diff --git a/kibana/Dockerfile b/kibana/Dockerfile old mode 100755 new mode 100644 diff --git a/kibana/start.sh b/kibana/start.sh old mode 100755 new mode 100644 diff --git a/logstash/Dockerfile b/logstash/Dockerfile old mode 100755 new mode 100644 diff --git a/minecraft-server/start b/minecraft-server/start old mode 100755 new mode 100644 diff --git a/minecraft-server/start-configuration b/minecraft-server/start-configuration old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deployBukkitSpigot b/minecraft-server/start-deployBukkitSpigot old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deployFTB b/minecraft-server/start-deployFTB old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deployForge b/minecraft-server/start-deployForge old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deployPaper b/minecraft-server/start-deployPaper old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deploySpongeVanilla b/minecraft-server/start-deploySpongeVanilla old mode 100755 new mode 100644 diff --git a/minecraft-server/start-deployVanilla b/minecraft-server/start-deployVanilla old mode 100755 new mode 100644 diff --git a/minecraft-server/start-finalSetup01World b/minecraft-server/start-finalSetup01World old mode 100755 new mode 100644 diff --git a/minecraft-server/start-finalSetup02Modpack b/minecraft-server/start-finalSetup02Modpack old mode 100755 new mode 100644 diff --git a/minecraft-server/start-finalSetup03Modconfig b/minecraft-server/start-finalSetup03Modconfig old mode 100755 new mode 100644 diff --git a/minecraft-server/start-finalSetup04ServerProperties b/minecraft-server/start-finalSetup04ServerProperties old mode 100755 new mode 100644 diff --git a/minecraft-server/start-finalSetup05EnvVariables b/minecraft-server/start-finalSetup05EnvVariables index 7146955a..d1c44f49 100644 --- a/minecraft-server/start-finalSetup05EnvVariables +++ b/minecraft-server/start-finalSetup05EnvVariables @@ -6,8 +6,8 @@ if [ "$REPLACE_ENV_VARIABLES" = "TRUE" ]; then # check if name of env variable matches the prefix # sanity check environment variables to avoid code injections if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then - echo "$name = $value" - find /data/ -type f -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \; + echo "Replacing $name with $value ..." + find /data/ -type f \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" -or -name "*.properties" \) -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \; fi done < <(env) fi diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup old mode 100755 new mode 100644 diff --git a/titan-gremlin/Dockerfile b/titan-gremlin/Dockerfile old mode 100755 new mode 100644 diff --git a/titan-gremlin/start-gremlin.sh b/titan-gremlin/start-gremlin.sh old mode 100755 new mode 100644 diff --git a/titandb/gremlin b/titandb/gremlin old mode 100755 new mode 100644 diff --git a/titandb/rexster b/titandb/rexster old mode 100755 new mode 100644 diff --git a/ubuntu-openjdk-7/Dockerfile b/ubuntu-openjdk-7/Dockerfile old mode 100755 new mode 100644