Updated debian package build docker files.

.travis.yml

@@ -32,24 +32,30 @@ script:
   - cd doc; make html; cd ..
 jobs:
   include:
+
     - stage: build packages
       os: osx
+      osx_image: xcode6.4
       before_install:
         - brew update
       install:
         - brew upgrade openssl
         - sudo ci/install-ssh2.sh
-        - sudo -H pip2 install -U delocate twine wheel pip setuptools
-        - cp /usr/local/lib/libssh2* .
         - ls -lh
-        - pip2 wheel .
+        - python --version
+        - wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py
+        - sudo python get-pip.py
+        - sudo -H pip install -U pip
+        - sudo -H pip install -U delocate twine wheel setuptools
+        - cp /usr/local/lib/libssh2* .
+        - pip wheel .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
         - delocate-listdeps --all *.whl
         - ls -l *.whl
         - rm -f *.dylib
-        - pip2 install --user -v *.whl
+        - pip install --user -v *.whl
         - pwd; mkdir temp; cd temp; pwd
         - python -c "from ssh2.session import Session; Session()"
         - cd ..; pwd
@@ -62,13 +68,11 @@ jobs:
 
     - stage: build packages
       os: osx
-      osx_image: xcode8
       before_install:
         - brew update
       install:
         - brew upgrade openssl
         - sudo ci/install-ssh2.sh
-        - sudo rm -f libssh2.1.dylib
         - sudo -H pip2 install -U delocate twine wheel pip setuptools
         - cp /usr/local/lib/libssh2* .
         - ls -lh
@@ -92,27 +96,24 @@ jobs:
 
     - stage: build packages
       os: osx
-      osx_image: xcode6.4
+      osx_image: xcode8
       before_install:
         - brew update
       install:
         - brew upgrade openssl
         - sudo ci/install-ssh2.sh
-        - ls -lh
-        - python --version
-        - wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py
-        - sudo python get-pip.py
-        - sudo -H pip install -U pip
-        - sudo -H pip install -U delocate twine wheel setuptools
+        - sudo rm -f libssh2.1.dylib
+        - sudo -H pip2 install -U delocate twine wheel pip setuptools
         - cp /usr/local/lib/libssh2* .
-        - pip wheel .
+        - ls -lh
+        - pip2 wheel .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
         - delocate-listdeps --all *.whl
         - ls -l *.whl
         - rm -f *.dylib
-        - pip install --user -v *.whl
+        - pip2 install --user -v *.whl
         - pwd; mkdir temp; cd temp; pwd
         - python -c "from ssh2.session import Session; Session()"
         - cd ..; pwd

ci/docker/debian8/Dockerfile

@@ -1,9 +1,9 @@
 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 apt-get -y update && 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
+RUN pip install cython
 
 ENV EMBEDDED_LIB 1
 ENV HAVE_AGENT_FWD 0

ci/docker/ubuntu14.04/Dockerfile

@@ -1,7 +1,6 @@
 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 apt-get -y update && 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
 RUN pip install cython

ci/docker/ubuntu16.04/Dockerfile

@@ -1,9 +1,9 @@
 FROM cdrx/fpm-ubuntu:16.04
 
-RUN apt-get -y update
-RUN apt-get -y install python-setuptools python-dev libssh2-1-dev python-pip git
+RUN apt-get -y update && 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
+RUN pip install cython
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0

ci/docker/ubuntu18.04/Dockerfile

@@ -1,9 +1,9 @@
 FROM cdrx/fpm-ubuntu:18.04
 
-RUN apt-get -y update
-RUN apt-get -y install python-setuptools python-dev libssh2-1-dev python-pip git
+RUN apt-get -y update && 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
+RUN pip install cython
 
 ENV EMBEDDED_LIB 1
 ENV HAVE_AGENT_FWD 0