Skip to content

Commit 85da414

Browse files
yosifkityosifkit
committed
Merge pull request docker-library#102 from sukrit007/patch_remove-test-directories
Fixes: Removal of test folders
2 parents 8179a07 + 3232863 commit 85da414

File tree

15 files changed

+90
-60
lines changed

15 files changed

+90
-60
lines changed

‎2.7/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ 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-
&& 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 '{}' + \
36+
&& find /usr/local -depth \
37+
\( \
38+
\( -type d -a -name test -o -name tests \) \
39+
-o \
40+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
41+
\) -exec rm -rf '{}' + \
4042
&& rm -rf /usr/src/python ~/.cache
4143

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

‎2.7/alpine/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ 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-
&& 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 '{}' + \
46+
&& find /usr/local -depth \
47+
\( \
48+
\( -type d -a -name test -o -name tests \) \
49+
-o \
50+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
51+
\) -exec rm -rf '{}' + \
5052
&& runDeps="$( \
5153
scanelf --needed --nobanner --recursive /usr/local \
5254
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

‎2.7/slim/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@ 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-
&& 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 '{}' + \
56+
&& find /usr/local -depth \
57+
\( \
58+
\( -type d -a -name test -o -name tests \) \
59+
-o \
60+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
61+
\) -exec rm -rf '{}' + \
6062
&& apt-get purge -y --auto-remove $buildDeps \
6163
&& rm -rf /usr/src/python ~/.cache
6264

‎2.7/wheezy/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ 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-
&& 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 '{}' + \
36+
&& find /usr/local -depth \
37+
\( \
38+
\( -type d -a -name test -o -name tests \) \
39+
-o \
40+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
41+
\) -exec rm -rf '{}' + \
4042
&& rm -rf /usr/src/python ~/.cache
4143

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

‎3.3/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ 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-
&& 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 '{}' + \
36+
&& find /usr/local -depth \
37+
\( \
38+
\( -type d -a -name test -o -name tests \) \
39+
-o \
40+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
41+
\) -exec rm -rf '{}' + \
4042
&& rm -rf /usr/src/python ~/.cache
4143

4244
# make some useful symlinks that are expected to exist

‎3.3/alpine/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ 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-
&& find /usr/local \
48-
\( -type d -a -name test -o -name tests \) \
49-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
50-
-exec rm -rf '{}' + \
47+
&& find /usr/local -depth \
48+
\( \
49+
\( -type d -a -name test -o -name tests \) \
50+
-o \
51+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
52+
\) -exec rm -rf '{}' + \
5153
&& runDeps="$( \
5254
scanelf --needed --nobanner --recursive /usr/local \
5355
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

‎3.3/slim/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ 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-
&& find /usr/local \
58-
\( -type d -a -name test -o -name tests \) \
59-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
60-
-exec rm -rf '{}' + \
57+
&& find /usr/local -depth \
58+
\( \
59+
\( -type d -a -name test -o -name tests \) \
60+
-o \
61+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
62+
\) -exec rm -rf '{}' + \
6163
&& apt-get purge -y --auto-remove $buildDeps \
6264
&& rm -rf /usr/src/python ~/.cache
6365

‎3.3/wheezy/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ 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-
&& 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 '{}' + \
36+
&& find /usr/local -depth \
37+
\( \
38+
\( -type d -a -name test -o -name tests \) \
39+
-o \
40+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
41+
\) -exec rm -rf '{}' + \
4042
&& rm -rf /usr/src/python ~/.cache
4143

4244
# make some useful symlinks that are expected to exist

‎3.4/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ RUN set -ex \
3232
&& make install \
3333
&& ldconfig \
3434
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
35-
&& 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 '{}' + \
35+
&& find /usr/local -depth \
36+
\( \
37+
\( -type d -a -name test -o -name tests \) \
38+
-o \
39+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
40+
\) -exec rm -rf '{}' + \
3941
&& rm -rf /usr/src/python ~/.cache
4042

4143
# make some useful symlinks that are expected to exist

‎3.4/alpine/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ RUN set -ex \
4444
&& make -j$(getconf _NPROCESSORS_ONLN) \
4545
&& make install \
4646
&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
47-
&& find /usr/local \
48-
\( -type d -a -name test -o -name tests \) \
49-
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
50-
-exec rm -rf '{}' + \
47+
&& find /usr/local -depth \
48+
\( \
49+
\( -type d -a -name test -o -name tests \) \
50+
-o \
51+
\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
52+
\) -exec rm -rf '{}' + \
5153
&& runDeps="$( \
5254
scanelf --needed --nobanner --recursive /usr/local \
5355
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

0 commit comments

Comments
 (0)