Merge pull request #240 from mpeuster/master

Fix: Broken external dependecy.

diff --git a/ansible/install.yml b/ansible/install.yml
index fc25d48..d6a6297 100755 (executable)
--- a/ansible/install.yml
+++ b/ansible/install.yml
@@ -64,7 +64,7 @@
      pip: name=prometheus_client state=latest
 
    - name: install latest urllib3 (fix error urllib3.connection.match_hostname = match_hostname)
-     pip: name=urllib3 state=latest
+     pip: name=urllib3 version=1.21.1
 
    - name: install iptc
      pip: name=python-iptables state=latest

diff --git a/setup.py b/setup.py
index 13f1dc2..d81f8a1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -54,9 +54,9 @@ setup(name='emuvim',
           'Flask',
           'flask_restful',
           'docker==2.0.2',
+          'urllib3==1.21.1',
           'requests',
           'prometheus_client',
-          'urllib3',
           'ipaddress',
           'simplejson'
       ],

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index 25d5337..214510e 100755 (executable)
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -41,7 +41,8 @@ RUN apt-get install -y curl iptables && \
 RUN curl -fsSL https://get.docker.com/gpg | apt-key add -
 RUN curl -fsSL https://get.docker.com/ | sh
 
-RUN pip install -U urllib3 setuptools pyparsing docker python-iptables
+RUN pip install -U urllib3==1.21.1
+RUN pip install -U setuptools pyparsing docker python-iptables
 WORKDIR /
 RUN git clone https://github.com/containernet/containernet.git
 RUN containernet/util/install.sh