Updated all distribution docker files to pull and push images to/from docker hub.

Updated travis cfg.

Author: Pan

.travis.yml

@@ -15,6 +15,8 @@ addons:
     packages:
       - libssh2-1-dev
       - openssh-server
+      - rpm
+      - dpkg
 install:
   - pip install flake8 jinja2
   - python setup.py build_ext --inplace
@@ -26,11 +28,14 @@ jobs:
   include:
     - stage: build_packages
       python: 3.6
-      install: skip
+      install:
+        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
       script:
         - ./docker/build-packages.sh
         - sudo chown -R ${USER} *
         - ls -ltrh *.{rpm,deb}
+        - for x in *.rpm; do echo "Package: $x"; rpm -qlp $x; done
+        - for x in *.deb; do echo "Package: $x"; dpkg-deb -c $x; done
       deploy:
         - provider: pypi
           skip_cleanup: true

docker/build-packages.sh

@@ -3,17 +3,25 @@
 for x in `ls -1d docker/{fedora,centos}*`; do
     name=`echo "$x" | awk -F/ '{print $2}'`
     dist_num=`echo "$name" | sed -r 's/[a-z]+([0-9]+)/\1/'`
+    docker_tag="parallelssh/ssh2-python:$name"
     if [[ $dist_num -gt 20 ]]; then
 	dist="fc${dist_num}"
     else
 	dist="el${dist_num}"
     fi
-    docker build $x -t $name
+    docker pull $docker_tag || echo
+    docker build --cache-from $docker_tag $x -t $name
+    docker tag $name $docker_tag
+    docker push $docker_tag
     docker run -v "$(pwd):/src/" "$name" --rpm-dist $dist -s python -t rpm setup.py
 done
 
 for x in `ls -1d docker/{debian,ubuntu}*`; do
     name=`echo "$x" | awk -F/ '{print $2}' | awk -F. '{print $1}'`
-    docker build $x -t "$name"
+    docker_tag="parallelssh/ssh2-python:$name"
+    docker pull $docker_tag || echo
+    docker build --cache-from $docker_tag $x -t $name
+    docker tag $name $docker_tag
+    docker push $docker_tag
     docker run -v "$(pwd):/src/" "$name" --iteration $name -s python -t deb setup.py
 done

docker/centos6/Dockerfile

@@ -1,4 +1,4 @@
 FROM cdrx/fpm-centos:6
 
 RUN yum -y install libssh2-devel python-devel python-setuptools git
-RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py
+RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel

docker/centos7/Dockerfile

@@ -1,4 +1,4 @@
 FROM cdrx/fpm-centos:7
 
 RUN yum -y install libssh2-devel python-devel python-setuptools git
-RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py
+RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel

docker/debian7/Dockerfile

@@ -2,3 +2,5 @@ FROM cdrx/fpm-debian:7
 
 RUN apt-get -y update
 RUN apt-get -y install python-setuptools python-dev libssh2-1-dev python-pip git
+RUN pip install -U setuptools
+RUN pip install -U pip wheel

docker/debian8/Dockerfile

@@ -2,3 +2,5 @@ FROM cdrx/fpm-debian:8
 
 RUN apt-get -y update
 RUN apt-get -y install python-setuptools python-dev libssh2-1-dev python-pip git
+RUN pip install -U setuptools
+RUN pip install -U pip wheel

docker/fedora22/Dockerfile

@@ -1,4 +1,4 @@
 FROM cdrx/fpm-fedora:22
 
 RUN yum -y install libssh2-devel python-devel python-setuptools git
-RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py
+RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel

docker/fedora23/Dockerfile

@@ -1,4 +1,4 @@
 FROM cdrx/fpm-fedora:23
 
 RUN yum -y install libssh2-devel python-devel python-setuptools git
-RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py
+RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel

docker/fedora24/Dockerfile

@@ -1,4 +1,4 @@
 FROM cdrx/fpm-fedora:24
 
 RUN yum -y install libssh2-devel python-devel python-setuptools git
-RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py
+RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel

docker/ubuntu14.04/Dockerfile

@@ -2,3 +2,5 @@ FROM cdrx/fpm-ubuntu:14.04
 
 RUN apt-get -y update
 RUN apt-get -y install python-setuptools python-dev libssh2-1-dev python-pip git
+RUN pip install -U setuptools
+RUN pip install -U pip wheel