From fa04256802170a7445705f1664ae9d964ea4d2c6 Mon Sep 17 00:00:00 2001 From: peusterm Date: Wed, 11 May 2016 14:46:32 +0200 Subject: [PATCH] Full integration with new Containernet --- ansible/install.yml | 8 +++++++- setup.py | 7 ++++--- utils/docker/Dockerfile | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ansible/install.yml b/ansible/install.yml index 0aa0ab6..7fed451 100755 --- a/ansible/install.yml +++ b/ansible/install.yml @@ -15,6 +15,9 @@ - name: install libffi-dev apt: pkg=libffi-dev state=installed + - name: install libssl-dev + apt: pkg=libssl-dev state=installed + - name: install pip apt: pkg=python-pip state=installed @@ -55,7 +58,7 @@ pip: name=requests state=latest - name: install docker-py - pip: name=docker-py state=latest + pip: name=docker-py version=1.7.1 - name: install prometheus_client pip: name=prometheus_client state=latest @@ -63,5 +66,8 @@ - name: install paramiko pip: name=paramiko state=latest + - name: install latest urllib3 (fix error urllib3.connection.match_hostname = match_hostname) + pip: name=urllib3 state=latest + diff --git a/setup.py b/setup.py index 8e4b16e..3657816 100644 --- a/setup.py +++ b/setup.py @@ -21,10 +21,11 @@ setup(name='emuvim', 'pytest', 'Flask', 'flask_restful', - 'docker-py', + 'docker-py==1.7.1', 'requests', - 'prometheus_client', - 'paramiko' + 'prometheus_client', + 'paramiko', + 'urllib3' ], zip_safe=False, entry_points={ diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile index ebd3607..7270ab5 100644 --- a/utils/docker/Dockerfile +++ b/utils/docker/Dockerfile @@ -9,6 +9,8 @@ COPY . /son-emu/ RUN cd /son-emu/ansible \ && ansible-playbook install.yml \ && cd /son-emu \ + # we need to reset the __pycache__ for correct test discovery + && rm -rf src/emuvim/test/__pycache__ \ && python setup.py install \ && echo 'Done' -- 2.25.1