From: AJ Bowen <aj@soulshake.net>
Date: Tue, 13 Jun 2017 14:44:09 +0000 (+0200)
Subject: Don't commit environment to bootstrapped image
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c219fcb92f582c2abc5a721be814b14d4c4f04eb;p=discourse_docker.git

Don't commit environment to bootstrapped image
---

diff --git a/launcher b/launcher
index 4115d6b..8a843e6 100755
--- a/launcher
+++ b/launcher
@@ -553,16 +553,17 @@ run_bootstrap() {
 
   rm -f $cidbootstrap
 
+  envs=$(echo "${env[@]}" | awk '{gsub("-e ", "");print}')
   run_command="cd /pups &&"
   if [[ ! "false" =  $update_pups ]]; then
     run_command="$run_command git pull &&"
   fi
-  run_command="$run_command /pups/bin/pups --stdin"
+  run_command="$run_command $envs /pups/bin/pups --stdin"
 
   echo $run_command
 
   unset ERR
-  (exec echo "$input" | $docker_path run $user_args $links "${env[@]}" -e DOCKER_HOST_IP="$docker_ip" --cidfile $cidbootstrap -i -a stdin -a stdout -a stderr $volumes $image \
+  (exec echo "$input" | $docker_path run $user_args $links -e DOCKER_HOST_IP="$docker_ip" --cidfile $cidbootstrap -i -a stdin -a stdout -a stderr $volumes $image \
     /bin/bash -c "$run_command") || ERR=$?
 
   unset FAILED