From a491ec57c9d9364aa0dff5f80786a9c721f52d43 Mon Sep 17 00:00:00 2001 From: micafer Date: Tue, 5 Mar 2019 13:58:17 +0100 Subject: [PATCH 1/2] Add urllib3 dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 38483ad72..b3cbfc052 100644 --- a/setup.py +++ b/setup.py @@ -67,5 +67,5 @@ platforms=["any"], install_requires=["ansible >= 2.0", "paramiko >= 1.14", "PyYAML", suds_pkg, sqlite_pkg, "cheroot", "boto >= 2.29", "apache-libcloud >= 2.4.0", "RADL >= 1.1.2", "bottle", "netaddr", - "requests >= 2.19", "scp", "tosca-parser", 'defusedxml'] + "requests >= 2.19", "scp", "tosca-parser", 'defusedxml', 'urllib3>=1.23'] ) From b4cecb0e6dcaba51f88485ea12501dac416d92f6 Mon Sep 17 00:00:00 2001 From: micafer Date: Wed, 6 Mar 2019 08:26:22 +0100 Subject: [PATCH 2/2] Install master branch of libcloud --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index de6cb1a22..04e3ffd34 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,14 +10,15 @@ RUN apt-get update && apt-get install --no-install-recommends -y openssh-client apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/ # Install IM -RUN apt-get update && apt-get install --no-install-recommends -y gcc python python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \ +RUN apt-get update && apt-get install --no-install-recommends -y gcc git python python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \ pip install setuptools --upgrade -I && \ pip install pip --upgrade -I && \ /usr/local/bin/pip install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-storage && \ /usr/local/bin/pip install MySQL-python pycrypto cheroot xmltodict pymongo && \ + cd /tmp && git clone https://github.com/apache/libcloud && /usr/local/bin/pip install /tmp/libcloud && \ /usr/local/bin/pip install IM==1.8.2 && \ /usr/local/bin/pip uninstall pip -y && \ - apt-get purge -y gcc python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \ + apt-get purge -y gcc git python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \ apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/ # Copy a ansible.cfg with correct minimum values