diff options
| author |  Yang Gao <yangg@google.com> | 2015-02-05 23:06:54 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-02-05 23:06:54 -0800 |
| commit | 1988221d15a4c092837b3cabf17f595c0d01e5c7 (patch) | |
| tree | fa7336cb27ed2f40b008b67d794f36e552fb234e /tools | |
| parent | 9bd60e39924035a49f2ede7c06bc6f48fb5213bd (diff) | |
Use environment variable to set root certs in c++ interop test.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_cxx/Dockerfile | 2 | ||||
| -rwxr-xr-x | tools/gce_setup/shared_startup_funcs.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/dockerfile/grpc_cxx/Dockerfile b/tools/dockerfile/grpc_cxx/Dockerfile index 43da9fefc3..9b20e7a58e 100644 --- a/tools/dockerfile/grpc_cxx/Dockerfile +++ b/tools/dockerfile/grpc_cxx/Dockerfile @@ -22,5 +22,7 @@ RUN cd /var/local/git/grpc && ls \ && make interop_server ADD service_account service_account +ADD cacerts cacerts +ENV GRPC_DEFAULT_SSL_ROOTS_FILE_PATH /cacerts/roots.pem CMD ["/var/local/git/grpc/bins/opt/interop_server", "--enable_ssl", "--port=8010"] diff --git a/tools/gce_setup/shared_startup_funcs.sh b/tools/gce_setup/shared_startup_funcs.sh index eea940864d..a6f73d1636 100755 --- a/tools/gce_setup/shared_startup_funcs.sh +++ b/tools/gce_setup/shared_startup_funcs.sh @@ -389,6 +389,7 @@ grpc_dockerfile_install() { grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; } [[ $image_label == "grpc/cxx" ]] && { + grpc_docker_sync_roots_pem $dockerfile_dir/cacerts || return 1; grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; } |