From 3fb7106e5876ab19afe732b89a61857ca15b1f89 Mon Sep 17 00:00:00 2001
From: PhilipWafula <philipwafula2@gmail.com>
Date: Wed, 20 Oct 2021 15:50:44 +0300
Subject: [PATCH] Adds libffi-dev lib for use with kilifi resources.

---
 apps/cic-cache/docker/Dockerfile    |  2 ++
 apps/cic-notify/docker/Dockerfile   | 17 ++++++++++-------
 apps/cic-ussd/docker/Dockerfile     |  8 +-------
 apps/data-seeding/docker/Dockerfile | 17 ++++++++++-------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/apps/cic-cache/docker/Dockerfile b/apps/cic-cache/docker/Dockerfile
index 114a42c7..be5cd172 100644
--- a/apps/cic-cache/docker/Dockerfile
+++ b/apps/cic-cache/docker/Dockerfile
@@ -4,6 +4,8 @@ FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
 
 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"
diff --git a/apps/cic-notify/docker/Dockerfile b/apps/cic-notify/docker/Dockerfile
index fe42f2c8..d5de10dc 100644
--- a/apps/cic-notify/docker/Dockerfile
+++ b/apps/cic-notify/docker/Dockerfile
@@ -2,21 +2,24 @@
 FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
 
 #RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62
+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
 
-ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
 COPY requirements.txt .
 
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
+RUN  pip install --index-url $PIP_INDEX_URL  \
+	  --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt
 
 COPY . .
 RUN python setup.py install
 
-COPY docker/*.sh .
-RUN chmod +x *.sh 
+COPY docker/*.sh ./
+RUN chmod +x /root/*.sh
 
 # ini files in config directory defines the configurable parameters for the application
 # they can all be overridden by environment variables
diff --git a/apps/cic-ussd/docker/Dockerfile b/apps/cic-ussd/docker/Dockerfile
index 87c136cd..cb1b10ce 100644
--- a/apps/cic-ussd/docker/Dockerfile
+++ b/apps/cic-ussd/docker/Dockerfile
@@ -2,7 +2,7 @@ ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
 
 FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
 
-RUN apt-get install -y redis-server
+RUN apt-get install redis-server libffi-dev -y
 # create secrets directory
 RUN mkdir -vp pgp/keys
 
@@ -15,18 +15,12 @@ ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL=https://pypi.org/simple
 
 RUN    pip install --index-url $PIP_INDEX_URL \
-    --pre \
-    --force-reinstall \
-    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
         cic-eth-aux-erc20-demurrage-token~=0.0.2a7
 
 
 COPY *requirements.txt ./
 RUN    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 
 
diff --git a/apps/data-seeding/docker/Dockerfile b/apps/data-seeding/docker/Dockerfile
index f993e33c..ec6064d1 100644
--- a/apps/data-seeding/docker/Dockerfile
+++ b/apps/data-seeding/docker/Dockerfile
@@ -7,20 +7,23 @@ RUN mkdir -vp /usr/local/etc/cic
 
 COPY package.json \
      package-lock.json \
-     .
+     ./
 
 
 RUN npm ci --production 
 #RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install
 
+COPY common/ cic_ussd/common/
 COPY requirements.txt .
-COPY config/ /usr/local/etc/data-seeding
+COPY config/ config
 
-ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \
-    --extra-index-url $GITLAB_PYTHON_REGISTRY \
-    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt
+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  \
+	  --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
+    -r requirements.txt
 
 COPY . .