From 7781f5aae8fd6a578175370d4f2775c3bfe2e9ce Mon Sep 17 00:00:00 2001
From: Troy McConaghy <troy@bigchaindb.com>
Date: Tue, 29 Jan 2019 13:51:29 +0100
Subject: [PATCH] Remove --no-cache-dir from all pip install cmds (#2628)

because it broke in pip 19
---
 Dockerfile                                              | 2 +-
 Dockerfile-all-in-one                                   | 2 +-
 Dockerfile-alpine                                       | 2 +-
 Dockerfile-dev                                          | 2 +-
 pkg/configuration/roles/bigchaindb/tasks/common.yml     | 2 +-
 pkg/configuration/roles/py36/templates/install_pip36.j2 | 2 +-
 pkg/configuration/roles/py36/templates/install_py36.j2  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b71473e2aa..9aae3eaf69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /usr/src/app
 RUN apt-get -qq update \
     && apt-get -y upgrade \
     && apt-get install -y jq \
-    && pip install --no-cache-dir . \
+    && pip install . \
     && apt-get autoremove \
     && apt-get clean
 
diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one
index 4a560c6797..a937055ef1 100644
--- a/Dockerfile-all-in-one
+++ b/Dockerfile-all-in-one
@@ -13,7 +13,7 @@ RUN apk --update add sudo bash \
         libffi-dev openssl-dev build-base jq \
     && apk add --no-cache libstdc++ dpkg gnupg \
     && pip3 install --upgrade pip cffi \
-    && pip install --no-cache-dir -e . \
+    && pip install -e . \
     && apk del build-dependencies \
     && rm -f /var/cache/apk/*
 
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index b6f6581e8a..7cea1e04eb 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -9,7 +9,7 @@ RUN apk --update add sudo \
         libffi-dev openssl-dev build-base \
     && apk add --no-cache libstdc++ \
     && pip3 install --upgrade pip cffi \
-    && pip install --no-cache-dir -e .[dev] \
+    && pip install -e .[dev] \
     && apk del build-dependencies \
     && rm -f /var/cache/apk/*
 # When developing with Python in a docker container, we are using PYTHONBUFFERED
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 98d3f8793a..f6535cabb5 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -32,5 +32,5 @@ ENV BIGCHAINDB_CI_ABCI ${abci_status}
 RUN mkdir -p /usr/src/app
 COPY . /usr/src/app/
 WORKDIR /usr/src/app
-RUN pip install --no-cache-dir -e .[dev]
+RUN pip install -e .[dev]
 RUN bigchaindb -y configure
\ No newline at end of file
diff --git a/pkg/configuration/roles/bigchaindb/tasks/common.yml b/pkg/configuration/roles/bigchaindb/tasks/common.yml
index 02acbc5a49..d0fe9ede49 100644
--- a/pkg/configuration/roles/bigchaindb/tasks/common.yml
+++ b/pkg/configuration/roles/bigchaindb/tasks/common.yml
@@ -10,7 +10,7 @@
   tags: [bigchaindb]
 
 - name: Install BigchainDB
-  shell: "python3.6 -m pip install --no-cache-dir -e /opt/stack/bigchaindb/.[dev] --ignore-installed pyyaml"
+  shell: "python3.6 -m pip install -e /opt/stack/bigchaindb/.[dev] --ignore-installed pyyaml"
   register: install_bdb
   failed_when: "'FAILED' in install_bdb.stderr or install_bdb.rc != 0"
   tags: [bigchaindb]
diff --git a/pkg/configuration/roles/py36/templates/install_pip36.j2 b/pkg/configuration/roles/py36/templates/install_pip36.j2
index 30cdc0e129..591e3835d7 100644
--- a/pkg/configuration/roles/py36/templates/install_pip36.j2
+++ b/pkg/configuration/roles/py36/templates/install_pip36.j2
@@ -3,6 +3,6 @@
 set -ex
 export PYTHON_PIP_VERSION=10.0.1
 wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'
-python3.6 get-pip.py --disable-pip-version-check --no-cache-dir
+python3.6 get-pip.py --disable-pip-version-check
 rm -f get-pip.py
 {% endraw %}
\ No newline at end of file
diff --git a/pkg/configuration/roles/py36/templates/install_py36.j2 b/pkg/configuration/roles/py36/templates/install_py36.j2
index 3563e9a7e3..4b5838c0fa 100644
--- a/pkg/configuration/roles/py36/templates/install_py36.j2
+++ b/pkg/configuration/roles/py36/templates/install_py36.j2
@@ -28,7 +28,7 @@ cd $HOME && \
 rm -rf /usr/src/python
 export PYTHON_PIP_VERSION=10.0.1
 wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'
-python3 get-pip.py --disable-pip-version-check --no-cache-dir "pip==$PYTHON_PIP_VERSION"
+python3 get-pip.py --disable-pip-version-check "pip==$PYTHON_PIP_VERSION"
 find /usr/local -depth \( \( -type d -a \( -name test -o -name tests \) \) -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \) -exec rm -rf '{}' +;
 rm -f get-pip.py
 {% endraw %}
\ No newline at end of file