Skip to content

Commit bb92d66

Browse files
committed
Fixes: Removal of test folders
1 parent e327311 commit bb92d66

File tree

15 files changed

+30
-45
lines changed

15 files changed

+30
-45
lines changed

2.7/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ RUN set -ex \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3636
&& find /usr/local \
37-
\( -type d -a -name test -o -name tests \) \
38-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
39-
-exec rm -rf '{}' + \
37+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
38+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
4039
&& rm -rf /usr/src/python
4140

4241
# install "virtualenv", since the vast majority of users of this image will want it

2.7/alpine/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ RUN set -ex \
4444
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
4545
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
4646
&& find /usr/local \
47-
\( -type d -a -name test -o -name tests \) \
48-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
49-
-exec rm -rf '{}' + \
47+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
48+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
5049
&& runDeps="$( \
5150
scanelf --needed --nobanner --recursive /usr/local \
5251
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

2.7/slim/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ RUN set -ex \
5454
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
5555
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
5656
&& find /usr/local \
57-
\( -type d -a -name test -o -name tests \) \
58-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
59-
-exec rm -rf '{}' + \
57+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
58+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
6059
&& apt-get purge -y --auto-remove $buildDeps \
6160
&& rm -rf /usr/src/python
6261

2.7/wheezy/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ RUN set -ex \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3636
&& find /usr/local \
37-
\( -type d -a -name test -o -name tests \) \
38-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
39-
-exec rm -rf '{}' + \
37+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
38+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
4039
&& rm -rf /usr/src/python
4140

4241
# install "virtualenv", since the vast majority of users of this image will want it

3.3/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ RUN set -ex \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3636
&& find /usr/local \
37-
\( -type d -a -name test -o -name tests \) \
38-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
39-
-exec rm -rf '{}' + \
37+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
38+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
4039
&& rm -rf /usr/src/python
4140

4241
# make some useful symlinks that are expected to exist

3.3/alpine/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ RUN set -ex \
4444
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
4545
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
4646
&& find /usr/local \
47-
\( -type d -a -name test -o -name tests \) \
48-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
49-
-exec rm -rf '{}' + \
47+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
48+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
5049
&& runDeps="$( \
5150
scanelf --needed --nobanner --recursive /usr/local \
5251
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

3.3/slim/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ RUN set -ex \
5454
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
5555
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
5656
&& find /usr/local \
57-
\( -type d -a -name test -o -name tests \) \
58-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
59-
-exec rm -rf '{}' + \
57+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
58+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
6059
&& apt-get purge -y --auto-remove $buildDeps \
6160
&& rm -rf /usr/src/python
6261

3.3/wheezy/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ RUN set -ex \
3434
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3535
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3636
&& find /usr/local \
37-
\( -type d -a -name test -o -name tests \) \
38-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
39-
-exec rm -rf '{}' + \
37+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
38+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
4039
&& rm -rf /usr/src/python
4140

4241
# make some useful symlinks that are expected to exist

3.4/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ RUN set -ex \
3333
&& ldconfig \
3434
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
3535
&& find /usr/local \
36-
\( -type d -a -name test -o -name tests \) \
37-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
38-
-exec rm -rf '{}' + \
36+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
37+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
3938
&& rm -rf /usr/src/python
4039

4140
# make some useful symlinks that are expected to exist

3.4/alpine/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ RUN set -ex \
4444
&& make install \
4545
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
4646
&& find /usr/local \
47-
\( -type d -a -name test -o -name tests \) \
48-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
49-
-exec rm -rf '{}' + \
47+
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
48+
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
5049
&& runDeps="$( \
5150
scanelf --needed --nobanner --recursive /usr/local \
5251
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

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