Merge remote-tracking branch 'origin/master' into lash/verify-cache

apps/cic-cache/docker/Dockerfile

@@ -1,19 +1,16 @@
-ARG DOCKER_REGISTRY=registry.gitlab.com/grassrootseconomics
+ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
 
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
+FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
 
 COPY requirements.txt .
 
-RUN apt-get install libffi-dev -y
-
 ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL="https://pypi.org/simple"
 
-RUN    pip install --index-url $PIP_INDEX_URL \
+RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
+    pip install --index-url $PIP_INDEX_URL \
     --pre \
-    --force-reinstall \
-    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt