Merge pull request #600 from grycap/devel

Devel
grycap · May 4, 2018 · f297ebd · f297ebd
2 parents e1bb255 + fd34ef1
commit f297ebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/IM/REST.py b/IM/REST.py
@@ -510,7 +510,6 @@ def RESTImportInfrastructure():
 
         new_id = InfrastructureManager.ImportInfrastructure(data, auth)
 
-        bottle.response.headers['InfID'] = new_id
         bottle.response.content_type = "text/uri-list"
         res = get_full_url('/infrastructures/%s' % new_id)
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -22,10 +22,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y gcc libmysqld-d
      apt-get purge -y 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/
 
-# Remove pip requests and force python-requests to be installed to avoid SSL ca errors
-RUN pip uninstall -y requests
-RUN apt-get update && apt-get install --no-install-recommends -y python-requests && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
+# Force requests to be version 2.11.1 to avoid SSL ca errors with proxy files
+RUN pip install requests==2.11.1
 
 # Copy a ansible.cfg with correct minimum values
 COPY ansible.cfg /etc/ansible/ansible.cfg