diff options
| author |  kpayson64 <kpayson@google.com> | 2016-08-22 19:42:05 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-22 19:42:05 -0700 |
| commit | 96c598f669d21aa36985a0f33ae80e5777b9b3e7 (patch) | |
| tree | 562bc418564d289c15d97fde1cc98a68acfbf76d | |
| parent | daf46996529a983013892344803539e9ae888f24 (diff) | |
| parent | 5e3193ecf627529135ac3bafc5ca48d9c590e0e0 (diff) | |
Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile
Add PyPy 5.3.1 to dockerfile and template
| -rw-r--r-- | templates/tools/dockerfile/apt_get_pyenv.include | 3 | ||||
| -rw-r--r-- | tools/dockerfile/test/python_pyenv_x64/Dockerfile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/apt_get_pyenv.include b/templates/tools/dockerfile/apt_get_pyenv.include index 70e90289b7..816b27904f 100644 --- a/templates/tools/dockerfile/apt_get_pyenv.include +++ b/templates/tools/dockerfile/apt_get_pyenv.include @@ -15,4 +15,5 @@ RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/py RUN pyenv update RUN pyenv install 3.5-dev RUN pyenv install 3.6-dev -RUN pyenv local 3.5-dev 3.6-dev +RUN pyenv install pypy-5.3.1 +RUN pyenv local 3.5-dev 3.6-dev pypy-5.3.1 diff --git a/tools/dockerfile/test/python_pyenv_x64/Dockerfile b/tools/dockerfile/test/python_pyenv_x64/Dockerfile index abb5f3c89b..ecd785a86d 100644 --- a/tools/dockerfile/test/python_pyenv_x64/Dockerfile +++ b/tools/dockerfile/test/python_pyenv_x64/Dockerfile @@ -95,7 +95,8 @@ RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/py RUN pyenv update RUN pyenv install 3.5-dev RUN pyenv install 3.6-dev -RUN pyenv local 3.5-dev 3.6-dev +RUN pyenv install pypy-5.3.1 +RUN pyenv local 3.5-dev 3.6-dev pypy-5.3.1 # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc |