Skip to content

Commit

Permalink
fix for branch versions of repos
Browse files Browse the repository at this point in the history
  • Loading branch information
deniseschannon committed Mar 21, 2017
1 parent b455cdd commit cb0b280
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/gce-10acre-ranch
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ generate_build_script() # signature: role container build_file
fi

if [[ "${REPOS}" != "" ]]; then
repos_value=\""REPOS="\"${REPOS}\"\"
docker_opts+=(, '"-v"', '"/var/run/docker.sock:/var/run/docker.sock"', '"-e"', ${repos_value})
repos_value="-e REPOS="\"${REPOS}\"
docker_opts+=(, '"-v"', '"/var/run/docker.sock:/var/run/docker.sock"')
fi

;;
Expand Down Expand Up @@ -394,7 +394,7 @@ generate_build_script() # signature: role container build_file
if [ "$(get_user_data_flag)" = "true" ]; then
user_data_clusters $(id -un) "$(cat ~/.ssh/id_rsa.pub)" ${build_file} "${container}" "${DOCKER_URL}" "${docker_cmd}" "${docker_opts[@]}"
else
docker_run_cmd="docker $(echo ${docker_opts[@]}| sed -e 's/,//g'|sed -e 's/\"//g') ${container} ${docker_cmd}"
docker_run_cmd="docker $(echo ${docker_opts[@]}| sed -e 's/,//g'|sed -e 's/\"//g') ${repos_value} ${container} ${docker_cmd}"
create_file ${build_file} "${docker_run_cmd}"
fi

Expand Down

0 comments on commit cb0b280

Please sign in to comment.