Skip to content

Commit d037ec9

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#121 from infosiftr/seeing-double
Fix two versions of pip being installed, and add a basic test to ensure the pip version we request is the pip version we get
2 parents 9cd676b + 682708e commit d037ec9

File tree

15 files changed

+22
-7
lines changed

15 files changed

+22
-7
lines changed

‎2.7/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -ex \
3333
&& ldconfig \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
36+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
3637
&& find /usr/local -depth \
3738
\( \
3839
\( -type d -a -name test -o -name tests \) \

‎2.7/alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN set -ex \
4343
&& make install \
4444
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
4545
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
46+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
4647
&& find /usr/local -depth \
4748
\( \
4849
\( -type d -a -name test -o -name tests \) \

‎2.7/slim/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ RUN set -ex \
5353
&& ldconfig \
5454
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
5555
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
56+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5657
&& find /usr/local -depth \
5758
\( \
5859
\( -type d -a -name test -o -name tests \) \

‎2.7/wheezy/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -ex \
3333
&& ldconfig \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
36+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
3637
&& find /usr/local -depth \
3738
\( \
3839
\( -type d -a -name test -o -name tests \) \

‎3.3/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -ex \
3333
&& ldconfig \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
36+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
3637
&& find /usr/local -depth \
3738
\( \
3839
\( -type d -a -name test -o -name tests \) \

‎3.3/alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN set -ex \
4444
&& make install \
4545
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
4646
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
47+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
4748
&& find /usr/local -depth \
4849
\( \
4950
\( -type d -a -name test -o -name tests \) \

‎3.3/slim/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
&& ldconfig \
5555
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
5656
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
57+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5758
&& find /usr/local -depth \
5859
\( \
5960
\( -type d -a -name test -o -name tests \) \

‎3.3/wheezy/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -ex \
3333
&& ldconfig \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
36+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
3637
&& find /usr/local -depth \
3738
\( \
3839
\( -type d -a -name test -o -name tests \) \

‎3.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ RUN set -ex \
3131
&& make -j$(nproc) \
3232
&& make install \
3333
&& ldconfig \
34-
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
34+
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
35+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
3536
&& find /usr/local -depth \
3637
\( \
3738
\( -type d -a -name test -o -name tests \) \

‎3.4/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ RUN set -ex \
4343
&& ./configure --enable-shared --enable-unicode=ucs4 \
4444
&& make -j$(getconf _NPROCESSORS_ONLN) \
4545
&& make install \
46-
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
46+
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
47+
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
4748
&& find /usr/local -depth \
4849
\( \
4950
\( -type d -a -name test -o -name tests \) \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy