From ca2ce90711ef1d4c92068b3cb16b34c79365a7e6 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 13 Jun 2017 11:11:19 -0400 Subject: [PATCH] Revert "Don't commit environment to bootstrapped image" --- launcher | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 -- 2.25.1