diff options
| author |  Mehrdad Afshari <mmx@google.com> | 2018-06-01 10:43:52 -0700 |
|---|---|---|
| committer | Mehrdad Afshari <mmx@google.com> | 2018-06-01 10:54:35 -0700 |
| commit | 45cd1f8a51485c66a82a955a4361db3a55797b39 (patch) | |
| tree | dcf0bf74652d4d7510eed4b61bd77ede1a15cf7c /templates/tools | |
| parent | 0397c7b95ee5baae949a395424b5bb25ec4b0160 (diff) | |
Install Python 3.7 in pyenv Dockerfile
Bump pyenv Dockerfile to Debian stretch to install
OpenSSL 1.0.2 which is required to build Python 3.7
and get Python 3.7 installed in the test docker
image.
Diffstat (limited to 'templates/tools')
| -rw-r--r-- | templates/tools/dockerfile/apt_get_pyenv.include | 5 | ||||
| -rw-r--r-- | templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/tools/dockerfile/apt_get_pyenv.include b/templates/tools/dockerfile/apt_get_pyenv.include index ef0964e597..e12b3e2c7f 100644 --- a/templates/tools/dockerfile/apt_get_pyenv.include +++ b/templates/tools/dockerfile/apt_get_pyenv.include @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y ${'\\'} mercurial ${'\\'} zlib1g-dev && apt-get clean -# Install Pyenv and dev Python versions 3.5 and 3.6 +# Install Pyenv and dev Python versions 3.{5,6,7} RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash ENV PATH /root/.pyenv/bin:$PATH RUN eval "$(pyenv init -)" @@ -18,5 +18,6 @@ RUN eval "$(pyenv virtualenv-init -)" RUN pyenv update RUN pyenv install 3.5-dev RUN pyenv install 3.6-dev +RUN pyenv install 3.7-dev RUN pyenv install pypy-5.3.1 -RUN pyenv local 3.5-dev 3.6-dev pypy-5.3.1 +RUN pyenv local 3.5-dev 3.6-dev 3.7-dev pypy-5.3.1 diff --git a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template index ba65c06a3b..b408b74c77 100644 --- a/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_pyenv_x64/Dockerfile.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM debian:jessie + FROM debian:stretch <%include file="../../apt_get_basic.include"/> <%include file="../../gcp_api_libraries.include"/> |