aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2015-10-09 11:26:27 -0700
committerGravatar Michael Lumish <mlumish@google.com>2015-10-09 11:26:27 -0700
commit4d3fc1452f36e84a1f31cdde5166ff9de4c4966d (patch)
tree54382f5ae4788332015624c668e25f262b76a4ac
parent1f0846d127de35916cb04181fb8fecfcbd07636b (diff)
parentc86909ce71b04a78a6cf7f662e1ce937d7f8ef3b (diff)
Merge pull request #3757 from murgatroid99/node_interop_docker_fix_real
Fix the Node interop test runner files
-rw-r--r--tools/jenkins/grpc_interop_node/Dockerfile1
-rwxr-xr-xtools/jenkins/grpc_interop_node/build_interop.sh3
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/jenkins/grpc_interop_node/Dockerfile b/tools/jenkins/grpc_interop_node/Dockerfile
index 587227b942..db5aff844d 100644
--- a/tools/jenkins/grpc_interop_node/Dockerfile
+++ b/tools/jenkins/grpc_interop_node/Dockerfile
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \
libc6-dbg \
libc6-dev \
libgtest-dev \
+ libssl-dev \
libtool \
make \
strace \
diff --git a/tools/jenkins/grpc_interop_node/build_interop.sh b/tools/jenkins/grpc_interop_node/build_interop.sh
index 84e25e3308..3b69715c9a 100755
--- a/tools/jenkins/grpc_interop_node/build_interop.sh
+++ b/tools/jenkins/grpc_interop_node/build_interop.sh
@@ -45,5 +45,4 @@ make install-certs
# build Node interop client & server
npm install -g node-gyp
-make install_c -C /var/local/git/grpc
-(cd src/node && npm install && node-gyp rebuild)
+(npm install && node-gyp rebuild)