diff options
| author |  Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-02-13 13:07:10 -0800 |
|---|---|---|
| committer | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-02-13 13:07:10 -0800 |
| commit | d1049b703949e279dcbe9435b6166b6276c964f1 (patch) | |
| tree | d0d2922c1a3498aa44ab33564377f48c18f64492 | |
| parent | d853baacd812d4b89f2713eb99f818dbd7424bda (diff) | |
| parent | 6fd5a35ecccac262412eae1f45762082f4c92079 (diff) | |
Merge pull request #520 from donnadionne/docker
Setting default ssh directory in the case of test runs running as root.
| -rwxr-xr-x | tools/gce_setup/grpc_docker.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh index 2e02653864..1c38582cb8 100755 --- a/tools/gce_setup/grpc_docker.sh +++ b/tools/gce_setup/grpc_docker.sh @@ -24,6 +24,10 @@ # Allows gcloud ssh commands to run on freshly started docker instances. _grpc_ensure_gcloud_ssh() { local default_key_file="$HOME/.ssh/google_compute_engine" + if [ "$HOME" == "/" ] + then + default_key_file="/root/.ssh/google_compute_engine" + fi [ -f $default_key_file ] || { ssh-keygen -f $default_key_file -N '' > /dev/null || { echo "could not precreate $default_key_file" 1>&2 |