Merge pull request #641 from grycap/devel

Update dockerfile

docker/Dockerfile

@@ -12,13 +12,13 @@ RUN pip install setuptools pip --upgrade -I
 RUN pip install pyOpenSSL --upgrade -I
 
 # Install IM
-RUN apt-get update && apt-get install --no-install-recommends -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev libmysqlclient20 && \
+RUN apt-get update && apt-get install --no-install-recommends -y git gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev libmysqlclient20 && \
      pip install pycrypto && \
      pip install MySQL-python && \
      # Install my version until PR #1215 is accepted
      cd /tmp && git clone https://github.com/micafer/libcloud && cd libcloud && pip install /tmp/libcloud && \
      pip install IM==1.7.3 && \
-     apt-get purge -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
+     apt-get purge -y git gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 
 # Install pip optional libraries

setup.py

@@ -64,5 +64,5 @@
       platforms=["any"],
       install_requires=["ansible >= 2.0", "paramiko >= 1.14", "PyYAML", suds_pkg, sqlite_pkg, "cheroot",
                         "boto >= 2.29", "apache-libcloud >= 2.3.0", "RADL >= 1.1.1", "bottle", "netaddr",
-                        "requests", "scp", "tosca-parser"]
+                        "requests == 2.11.1", "scp", "tosca-parser"]
       )