From a332c672d4977ae33548254d4dc9dffd46618d12 Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Thu, 26 Apr 2018 10:48:35 +0200 Subject: [PATCH] Update pip using update.sh --- 2/Dockerfile | 2 +- 2/slim/Dockerfile | 2 +- 3/Dockerfile | 2 +- 3/slim/Dockerfile | 2 +- Dockerfile-slim.template | 2 +- Dockerfile.template | 2 +- update.sh | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/2/Dockerfile b/2/Dockerfile index 5bf4a8c..68add4f 100644 --- a/2/Dockerfile +++ b/2/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION 6.0.0 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION 10.0.1 RUN set -ex; \ \ diff --git a/2/slim/Dockerfile b/2/slim/Dockerfile index 56cb088..5d08b7e 100644 --- a/2/slim/Dockerfile +++ b/2/slim/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION 6.0.0 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION 10.0.1 RUN set -ex; \ \ diff --git a/3/Dockerfile b/3/Dockerfile index e301438..2a0a38b 100644 --- a/3/Dockerfile +++ b/3/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION 6.0.0 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION 10.0.1 RUN set -ex; \ \ diff --git a/3/slim/Dockerfile b/3/slim/Dockerfile index f7bb97c..fe8a422 100644 --- a/3/slim/Dockerfile +++ b/3/slim/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION 6.0.0 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION 10.0.1 RUN set -ex; \ \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index e806b38..b28c53a 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION %%PYPY_VERSION%% # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION %%PIP_VERSION%% RUN set -ex; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index 2663f0b..5118d06 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV PYPY_VERSION %%PYPY_VERSION%% # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_PIP_VERSION %%PIP_VERSION%% RUN set -ex; \ \ diff --git a/update.sh b/update.sh index 7215efd..8ddb418 100755 --- a/update.sh +++ b/update.sh @@ -89,6 +89,7 @@ for version in "${versions[@]}"; do for variant in '' slim; do sed -r \ -e 's!%%PYPY_VERSION%%!'"$fullVersion"'!g' \ + -e 's!%%PIP_VERSION%%!'"$pipVersion"'!g' \ -e 's!%%TAR%%!'"$pypy"'!g' \ -e 's!%%CMD%%!'"$cmd"'!g' \ -e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$linuxArchCase")"'!g' \