From 5613ca4babc8f605730495ee5f34777e6ae256ac Mon Sep 17 00:00:00 2001 From: Matt Clay <matt@mystile.com> Date: Tue, 9 Jan 2018 18:00:01 -0800 Subject: [PATCH] Use Python 3.7.0a2 for default docker container. --- test/runner/Dockerfile | 7 ++++--- test/runner/docker/python3.7.0a2 | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 test/runner/docker/python3.7.0a2 diff --git a/test/runner/Dockerfile b/test/runner/Dockerfile index cb2e3012348..94a7082c834 100644 --- a/test/runner/Dockerfile +++ b/test/runner/Dockerfile @@ -30,9 +30,10 @@ RUN apt-get update -y && \ ADD https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer /tmp/pyenv-installer RUN bash -c 'PYENV_ROOT=/usr/local/opt/pyenv bash /tmp/pyenv-installer' -RUN bash -c 'PYENV_ROOT=/usr/local/opt/pyenv /usr/local/opt/pyenv/bin/pyenv install 3.7-dev' -RUN ln -s /usr/local/opt/pyenv/versions/3.7-dev/bin/python3.7 /usr/local/bin/python3.7 -RUN ln -s /usr/local/opt/pyenv/versions/3.7-dev/bin/pip3.7 /usr/local/bin/pip3.7 +COPY docker/python* /tmp/ +RUN bash -c 'PYENV_ROOT=/usr/local/opt/pyenv /usr/local/opt/pyenv/bin/pyenv install /tmp/python3.7.0a2' +RUN ln -s /usr/local/opt/pyenv/versions/python3.7.0a2/bin/python3.7 /usr/local/bin/python3.7 +RUN ln -s /usr/local/opt/pyenv/versions/python3.7.0a2/bin/pip3.7 /usr/local/bin/pip3.7 RUN rm /etc/apt/apt.conf.d/docker-clean RUN locale-gen en_US.UTF-8 diff --git a/test/runner/docker/python3.7.0a2 b/test/runner/docker/python3.7.0a2 new file mode 100644 index 00000000000..bd6a16826c5 --- /dev/null +++ b/test/runner/docker/python3.7.0a2 @@ -0,0 +1,8 @@ +#require_gcc +install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl +install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.7.0a2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a2.tar.xz#3e5adaa8a264b0c8eeab7b8a0185acec053b0d1547d2712ebc915153c4a52f28" ldflags_dirs standard verify_py37 ensurepip +else + install_package "Python-3.7.0a2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a2.tgz#e1fd8af5a80d99ab64e7754f1bdd6d8429bf82ead81c68809ce056af319577be" ldflags_dirs standard verify_py37 ensurepip +fi