diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2017-03-30 08:07:50 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-30 08:07:50 -0700 |
| commit | 8f7d3b33da7de0c8f4f778c4a2a6f6d5c534221e (patch) | |
| tree | 8ce89d1469661e162e2fadc11af115ff3bf6cc40 | |
| parent | a232b52c4ac97272b9342e4609208439bf9a4eeb (diff) | |
| parent | 76a3943ab9ff2926990fc43921b60d7074161a6a (diff) | |
Merge pull request #10377 from ericgribkoff/fix_interop_docker
fix docker -p flag for interop tests
fix the version of h2 installed for interop test docker images
3 files changed, 3 insertions, 4 deletions
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template index a49e951289..b517921f08 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template @@ -33,7 +33,7 @@ <%include file="../../go_path.include"/> <%include file="../../python_deps.include"/> - RUN pip install twisted h2 hyper + RUN pip install twisted h2==2.6.1 hyper # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile index da00152825..094a4e096d 100644 --- a/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile @@ -47,7 +47,7 @@ RUN pip install pip --upgrade RUN pip install virtualenv RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 -RUN pip install twisted h2 hyper +RUN pip install twisted h2==2.6.1 hyper # Define the default command. CMD ["bash"] diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 1a83c10a42..2d7f4a625d 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -728,8 +728,7 @@ def server_jobspec(language, docker_image, insecure=False, manual_cmd_log=None): ] else: - portstr = str(_DEFAULT_SERVER_PORT) - docker_args += ['-p', '%s:%s'%(portstr, portstr)] + docker_args += ['-p', str(_DEFAULT_SERVER_PORT)] docker_cmdline = docker_run_cmdline(cmdline, image=docker_image, |