From 48f6f1aa460afdee16f7dcf959f37f88f0e4564a Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 4 May 2018 11:18:57 +0200 Subject: [PATCH 1/2] Remove unnecesary line --- IM/REST.py | 1 - 1 file changed, 1 deletion(-) diff --git a/IM/REST.py b/IM/REST.py index 3e1faab12..8e36f6c48 100644 --- 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) From fd34ef139f48e748543a2e26712b52462d67f6cb Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 4 May 2018 11:19:51 +0200 Subject: [PATCH 2/2] Improve dockerfile --- docker/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 492d8f9f9..16515c4aa 100644 --- 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