From: Sam <sam.saffron@gmail.com>
Date: Tue, 13 Jun 2017 15:11:19 +0000 (-0400)
Subject: Revert "Don't commit environment to bootstrapped image"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ca2ce90711ef1d4c92068b3cb16b34c79365a7e6;p=discourse_docker.git

Revert "Don't commit environment to bootstrapped image"
---

diff --git a/launcher b/launcher
index 45d2769..850041a 100755
--- a/launcher
+++ b/launcher
@@ -553,17 +553,16 @@ 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 $envs /pups/bin/pups --stdin"
+  run_command="$run_command /pups/bin/pups --stdin"
 
   echo $run_command
 
   unset ERR
-  (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 \
+  (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 \
     /bin/bash -c "$run_command") || ERR=$?
 
   unset FAILED