diff options
| author |  donnadionne <donnadionne2011@gmail.com> | 2015-06-02 16:55:04 -0700 |
|---|---|---|
| committer | donnadionne <donnadionne2011@gmail.com> | 2015-06-02 16:55:04 -0700 |
| commit | f11214faa5a86df188d4631241b63ae90f1ea6a6 (patch) | |
| tree | 90d54b094ea16b557a800ac3c745352405e10f05 /tools/gce_setup/shared_startup_funcs.sh | |
| parent | c86b1dd59d1e61b9377f2dca0741061b2e5de1da (diff) | |
| parent | 8cbc2506d56af103a6691648eba660aac874f6a3 (diff) | |
Merge pull request #1827 from madongfly/creds_test
Enable service_account_creds test and compute_engine_creds for gRpc-java.
Diffstat (limited to 'tools/gce_setup/shared_startup_funcs.sh')
| -rwxr-xr-x | tools/gce_setup/shared_startup_funcs.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gce_setup/shared_startup_funcs.sh b/tools/gce_setup/shared_startup_funcs.sh index a3a3b59c8a..60cd9f6897 100755 --- a/tools/gce_setup/shared_startup_funcs.sh +++ b/tools/gce_setup/shared_startup_funcs.sh @@ -413,6 +413,9 @@ grpc_dockerfile_install() { [[ $image_label == "grpc/java_base" ]] && { grpc_docker_sync_github_key $dockerfile_dir/.ssh 'java_base_ssh_key' || return 1; } + [[ $image_label == "grpc/java" ]] && { + grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; + } [[ $image_label == "grpc/ruby" ]] && { grpc_docker_sync_roots_pem $dockerfile_dir/cacerts || return 1; grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; |