diff options
| author |  Matt Kwong <matt-kwong@users.noreply.github.com> | 2017-10-06 15:27:25 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-06 15:27:25 -0700 |
| commit | 15b73035ee075bdd7979d83f6380b2c2f2b84659 (patch) | |
| tree | ebe4f433066dbe63c98e2ee75cf55aacf495fb92 | |
| parent | 1ed8dd119571a370407534dfdf6662bb5c809d4a (diff) | |
| parent | 87bc56ab58b2f5fe8afaa92f94a9dfa0f9016c61 (diff) | |
Merge pull request #12866 from matt-kwong/fix-node
Install Mako to generate files in grpc/grpc-node
3 files changed, 7 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template index aa34a694fb..af85a54235 100644 --- a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template @@ -32,5 +32,8 @@ <%include file="../../python_deps.include"/> <%include file="../../node_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Install Mako to generate files in grpc/grpc-node + RUN pip install Mako + # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 4f18dbae79..d0e5af64cc 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -102,5 +102,8 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ RUN mkdir /var/local/jenkins +# Install Mako to generate files in grpc/grpc-node +RUN pip install Mako + # Define the default command. CMD ["bash"] diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index dd98a12c65..b6cc43e0ab 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -60,7 +60,7 @@ pod repo update # needed by python # python pip install virtualenv --user python -pip install -U six tox setuptools twisted pyyaml --user python +pip install -U Mako six tox setuptools twisted pyyaml --user python export PYTHONPATH=/Library/Python/3.4/site-packages # set xcode version for Obj-C tests |