Merge pull request #144 from infosiftr/3.6.0a4
Update to 3.6.0a4 (and add "--force-reinstall" to pip)
This commit is contained in:
commit
4b37165e4a
|
@ -47,7 +47,12 @@ RUN set -ex \
|
|||
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
|
||||
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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" \
|
||||
# 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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -64,7 +64,12 @@ RUN set -ex \
|
|||
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
|
||||
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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" \
|
||||
# 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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -60,7 +60,12 @@ RUN set -ex \
|
|||
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
|
||||
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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" \
|
||||
# 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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -47,7 +47,12 @@ RUN set -ex \
|
|||
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
|
||||
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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" \
|
||||
# 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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -56,7 +56,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -73,7 +73,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -69,7 +69,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -56,7 +56,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -56,7 +56,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -73,7 +73,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -69,7 +69,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -56,7 +56,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -56,7 +56,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -73,7 +73,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -69,7 +69,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -42,7 +42,10 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
|
|||
\
|
||||
$pipInstall = ('pip=={0}' -f $env:PYTHON_PIP_VERSION); \
|
||||
Write-Host ('Installing {0} ...' -f $pipInstall); \
|
||||
pip install --no-cache-dir --upgrade $pipInstall; \
|
||||
# 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 $pipInstall; \
|
||||
\
|
||||
Write-Host 'Verifying pip install ...'; \
|
||||
pip --version; \
|
||||
|
|
|
@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
|
||||
ENV PYTHON_VERSION 3.6.0a3
|
||||
ENV PYTHON_VERSION 3.6.0a4
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 8.1.2
|
||||
|
@ -50,7 +50,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -12,7 +12,7 @@ ENV LANG C.UTF-8
|
|||
RUN apk add --no-cache ca-certificates
|
||||
|
||||
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
|
||||
ENV PYTHON_VERSION 3.6.0a3
|
||||
ENV PYTHON_VERSION 3.6.0a4
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 8.1.2
|
||||
|
@ -67,7 +67,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
|
||||
ENV PYTHON_VERSION 3.6.0a3
|
||||
ENV PYTHON_VERSION 3.6.0a4
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 8.1.2
|
||||
|
@ -63,7 +63,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -2,7 +2,7 @@ FROM microsoft/windowsservercore
|
|||
|
||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
|
||||
|
||||
ENV PYTHON_VERSION 3.6.0a3
|
||||
ENV PYTHON_VERSION 3.6.0a4
|
||||
ENV PYTHON_RELEASE 3.6.0
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
|
@ -36,7 +36,10 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
|
|||
\
|
||||
$pipInstall = ('pip=={0}' -f $env:PYTHON_PIP_VERSION); \
|
||||
Write-Host ('Installing {0} ...' -f $pipInstall); \
|
||||
pip install --no-cache-dir --upgrade $pipInstall; \
|
||||
# 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 $pipInstall; \
|
||||
\
|
||||
Write-Host 'Verifying pip install ...'; \
|
||||
pip --version; \
|
||||
|
|
|
@ -67,7 +67,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -50,7 +50,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -63,7 +63,12 @@ RUN set -ex \
|
|||
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
|
||||
&& rm /tmp/get-pip.py \
|
||||
; fi \
|
||||
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
|
||||
# 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
|
||||
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_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" ] \
|
||||
\
|
||||
&& find /usr/local -depth \
|
||||
|
|
|
@ -36,7 +36,10 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
|
|||
\
|
||||
$pipInstall = ('pip=={0}' -f $env:PYTHON_PIP_VERSION); \
|
||||
Write-Host ('Installing {0} ...' -f $pipInstall); \
|
||||
pip install --no-cache-dir --upgrade $pipInstall; \
|
||||
# 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 $pipInstall; \
|
||||
\
|
||||
Write-Host 'Verifying pip install ...'; \
|
||||
pip --version; \
|
||||
|
|
Loading…
Reference in New Issue