Merge branch 'master' of github.com:docker-library/python into patch_remove-test-directories

sukrit007 · sukrit007 · commit 33747f359a56 · 2016-04-20T18:45:52.000-07:00
# 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
diff --git a/2.7/Dockerfile b/2.7/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # install "virtualenv", since the vast majority of users of this image will want it
 RUN pip install --no-cache-dir virtualenv
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
@@ -55,6 +55,6 @@ RUN set -ex \
 	)" \
 	&& apk add --virtual .python-rundeps $runDeps \
 	&& apk del .build-deps .fetch-deps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 CMD ["python2"]
diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile
@@ -57,6 +57,6 @@ RUN set -ex \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 CMD ["python2"]
diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # install "virtualenv", since the vast majority of users of this image will want it
 RUN pip install --no-cache-dir virtualenv
diff --git a/3.3/Dockerfile b/3.3/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN set -ex \
 	)" \
 	&& apk add --virtual .python-rundeps $runDeps \
 	&& apk del .build-deps .fetch-deps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
@@ -57,7 +57,7 @@ RUN set -ex \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
@@ -35,7 +35,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN set -ex \
 	)" \
 	&& apk add --virtual .python-rundeps $runDeps \
 	&& apk del .build-deps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
@@ -56,7 +56,7 @@ RUN set -ex \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
@@ -35,7 +35,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
@@ -35,7 +35,7 @@ RUN set -ex \
 	&& find /usr/local \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN set -ex \
 	)" \
 	&& apk add --virtual .python-rundeps $runDeps \
 	&& apk del .build-deps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
@@ -56,7 +56,7 @@ RUN set -ex \
 		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
 		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
-	&& rm -rf /usr/src/python
+	&& rm -rf /usr/src/python ~/.cache
 
 # make some useful symlinks that are expected to exist
 RUN cd /usr/local/bin \
