Merge a0d46fa; mirror base image change :6.9 -> :6

Like with CentOS 5 there's a CentOS 6 Docker image which is more up to
date (tag :6) than the latest release (tag :6.9).
See: pypa#206

Author: dolang

.travis.yml

@@ -31,3 +31,4 @@ deploy:
   script: docker/deploy.sh
   on:
     branch: master
+    repo: pypa/manylinux

build.sh

@@ -5,7 +5,7 @@ set -ex
 
 docker/build_scripts/prefetch.sh openssl curl
 if [ $PLATFORM == x86_64 ]; then
-    docker build --rm -t quay.io/pypa/manylinux2010_centos-6.9-no-vsyscall -f docker/glibc/Dockerfile docker/glibc/
+    docker build --rm -t quay.io/pypa/manylinux2010_centos-6-no-vsyscall -f docker/glibc/Dockerfile docker/glibc/
 fi
 docker build --rm -t quay.io/pypa/manylinux2010_$PLATFORM:$TRAVIS_COMMIT -f docker/Dockerfile-$PLATFORM docker/
 docker system prune -f

docker/Dockerfile-x86_64

@@ -1,5 +1,5 @@
 # See docker/glibc/
-FROM quay.io/pypa/manylinux2010_centos-6.9-no-vsyscall
+FROM quay.io/pypa/manylinux2010_centos-6-no-vsyscall
 LABEL maintainer="The ManyLinux project"
 
 ENV LC_ALL en_US.UTF-8

docker/build_scripts/build.sh

@@ -185,10 +185,9 @@ find /opt/_internal -type f -print0 \
 # We do not need the Python test suites, or indeed the precompiled .pyc and
 # .pyo files. Partially cribbed from:
 #    https://github.com/docker-library/python/blob/master/3.4/slim/Dockerfile
-find /opt/_internal \
+find /opt/_internal -depth \
      \( -type d -a -name test -o -name tests \) \
-  -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-  -print0 | xargs -0 rm -f
+  -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) | xargs rm -rf
 
 for PYTHON in /opt/python/*/bin/python; do
     # Smoke test to make sure that our Pythons work, and do indeed detect as

docker/glibc/Dockerfile

@@ -1,9 +1,9 @@
-FROM centos:6.9 as centos-with-vsyscall
+FROM centos:6 as centos-with-vsyscall
 
 COPY ./build_scripts /build_scripts
 RUN bash /build_scripts/rebuild-glibc-without-vsyscall.sh
 
-FROM centos:6.9
+FROM centos:6
 LABEL maintainer="The Manylinux project"
 
 COPY --from=centos-with-vsyscall /rpms /rpms