Skip to content

Commit 33747f3

Browse files
committed
Merge branch 'master' of github.com:docker-library/python into patch_remove-test-directories
# Conflicts: # 2.7/Dockerfile # 2.7/wheezy/Dockerfile # 3.3/Dockerfile # 3.3/wheezy/Dockerfile # 3.4/Dockerfile # 3.4/wheezy/Dockerfile # 3.5/Dockerfile
2 parents bb92d66 + 6452851 commit 33747f3

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

2.7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex \
3636
&& find /usr/local \
3737
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
3838
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
39-
&& rm -rf /usr/src/python
39+
&& rm -rf /usr/src/python ~/.cache
4040

4141
# install "virtualenv", since the vast majority of users of this image will want it
4242
RUN pip install --no-cache-dir virtualenv

2.7/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ RUN set -ex \
5555
)" \
5656
&& apk add --virtual .python-rundeps $runDeps \
5757
&& apk del .build-deps .fetch-deps \
58-
&& rm -rf /usr/src/python
58+
&& rm -rf /usr/src/python ~/.cache
5959

6060
CMD ["python2"]

2.7/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ RUN set -ex \
5757
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
5858
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
5959
&& apt-get purge -y --auto-remove $buildDeps \
60-
&& rm -rf /usr/src/python
60+
&& rm -rf /usr/src/python ~/.cache
6161

6262
CMD ["python2"]

2.7/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex \
3636
&& find /usr/local \
3737
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
3838
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
39-
&& rm -rf /usr/src/python
39+
&& rm -rf /usr/src/python ~/.cache
4040

4141
# install "virtualenv", since the vast majority of users of this image will want it
4242
RUN pip install --no-cache-dir virtualenv

3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex \
3636
&& find /usr/local \
3737
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
3838
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
39-
&& rm -rf /usr/src/python
39+
&& rm -rf /usr/src/python ~/.cache
4040

4141
# make some useful symlinks that are expected to exist
4242
RUN cd /usr/local/bin \

3.3/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN set -ex \
5555
)" \
5656
&& apk add --virtual .python-rundeps $runDeps \
5757
&& apk del .build-deps .fetch-deps \
58-
&& rm -rf /usr/src/python
58+
&& rm -rf /usr/src/python ~/.cache
5959

6060
# make some useful symlinks that are expected to exist
6161
RUN cd /usr/local/bin \

3.3/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN set -ex \
5757
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
5858
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
5959
&& apt-get purge -y --auto-remove $buildDeps \
60-
&& rm -rf /usr/src/python
60+
&& rm -rf /usr/src/python ~/.cache
6161

6262
# make some useful symlinks that are expected to exist
6363
RUN cd /usr/local/bin \

3.3/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex \
3636
&& find /usr/local \
3737
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
3838
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
39-
&& rm -rf /usr/src/python
39+
&& rm -rf /usr/src/python ~/.cache
4040

4141
# make some useful symlinks that are expected to exist
4242
RUN cd /usr/local/bin \

3.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -ex \
3535
&& find /usr/local \
3636
\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
3737
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
38-
&& rm -rf /usr/src/python
38+
&& rm -rf /usr/src/python ~/.cache
3939

4040
# make some useful symlinks that are expected to exist
4141
RUN cd /usr/local/bin \

3.4/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN set -ex \
5555
)" \
5656
&& apk add --virtual .python-rundeps $runDeps \
5757
&& apk del .build-deps \
58-
&& rm -rf /usr/src/python
58+
&& rm -rf /usr/src/python ~/.cache
5959

6060
# make some useful symlinks that are expected to exist
6161
RUN cd /usr/local/bin \

0 commit comments

Comments
 (0)