Skip to content

Commit

Permalink
Update 2.7 manually
Browse files Browse the repository at this point in the history
  • Loading branch information
@mal
mal committed Apr 7, 2017
1 parent d69548e commit ca96580
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
7 changes: 6 additions & 1 deletion 2.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 34.3.3
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -50,7 +52,10 @@ RUN set -ex \
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
# then we use "pip list" to ensure we don't have more than one pip version installed
# https://github.com/docker-library/python/pull/100
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 34.3.3
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -67,7 +69,10 @@ RUN set -ex \
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
# then we use "pip list" to ensure we don't have more than one pip version installed
# https://github.com/docker-library/python/pull/100
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 34.3.3
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -65,7 +67,10 @@ RUN set -ex \
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
# then we use "pip list" to ensure we don't have more than one pip version installed
# https://github.com/docker-library/python/pull/100
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 34.3.3
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -50,7 +52,10 @@ RUN set -ex \
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
# then we use "pip list" to ensure we don't have more than one pip version installed
# https://github.com/docker-library/python/pull/100
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
Expand Down

0 comments on commit ca96580

Please sign in to comment.