p36850791
/
python_sonar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #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
This commit is contained in:
yosifkit 2016-06-28 15:43:49 -07:00 committed by GitHub
parent 9cd676b226 682708e786
commit d037ec96ed
15 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
2.7/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
2.7/alpine/Dockerfile
View File

@ -43,6 +43,7 @@ RUN set -ex \
&& make install \ && make install \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
2.7/slim/Dockerfile
View File

@ -53,6 +53,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
2.7/wheezy/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
3.3/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
3.3/alpine/Dockerfile
View File

@ -44,6 +44,7 @@ RUN set -ex \
&& make install \ && make install \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
3.3/slim/Dockerfile
View File

@ -54,6 +54,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

1
3.3/wheezy/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex \
&& ldconfig \ && ldconfig \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.4/Dockerfile
View File

@ -31,7 +31,8 @@ RUN set -ex \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.4/alpine/Dockerfile
View File

@ -43,7 +43,8 @@ RUN set -ex \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure --enable-shared --enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.4/slim/Dockerfile
View File

@ -52,7 +52,8 @@ RUN set -ex \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.4/wheezy/Dockerfile
View File

@ -31,7 +31,8 @@ RUN set -ex \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.5/Dockerfile
View File

@ -31,7 +31,8 @@ RUN set -ex \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.5/alpine/Dockerfile
View File

@ -43,7 +43,8 @@ RUN set -ex \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure --enable-shared --enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \

3
3.5/slim/Dockerfile
View File

@ -52,7 +52,8 @@ RUN set -ex \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
&& [ "$(pip list | awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
&& find /usr/local -depth \ && find /usr/local -depth \
\( \ \( \
\( -type d -a -name test -o -name tests \) \ \( -type d -a -name test -o -name tests \) \