From 74eb5df1bbc1ce52c39fa7b1a8f0824cbd600683 Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Wed, 7 Jul 2021 16:15:42 -0700
Subject: [PATCH] fix mr to send image to right the place and can we do kaniko
 target arg as a variable??

---
 apps/cic-eth/.gitlab-ci.yml        |  4 +++-
 apps/cic-ussd/.gitlab-ci.yml       |  2 +-
 apps/cic-ussd/docker/Dockerfile_ci | 30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 apps/cic-ussd/docker/Dockerfile_ci

diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index ef2b7462..7e63c409 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -3,11 +3,13 @@
         APP_NAME: cic-eth
         DOCKERFILE_PATH: docker/Dockerfile_ci
         CONTEXT: apps/$APP_NAME
+        KANIKO_TARGET_ARGS: "--target dev"
 
 build-mr-cic-eth:
     extends:
         - .cic_eth_variables
-        - .py_build_target_dev
+          #- .py_build_target_dev
+        - .py_build_merge_request
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml
index 94e8f06d..5a1b8742 100644
--- a/apps/cic-ussd/.gitlab-ci.yml
+++ b/apps/cic-ussd/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 .cic_ussd_variables:
     variables:
         APP_NAME: cic-ussd
-        DOCKERFILE_PATH: docker/Dockerfile
+        DOCKERFILE_PATH: docker/Dockerfile_ci
         CONTEXT: apps/$APP_NAME
 
 build-mr-cic-ussd:
diff --git a/apps/cic-ussd/docker/Dockerfile_ci b/apps/cic-ussd/docker/Dockerfile_ci
new file mode 100644
index 00000000..ba42047b
--- /dev/null
+++ b/apps/cic-ussd/docker/Dockerfile_ci
@@ -0,0 +1,30 @@
+# syntax = docker/dockerfile:1.2
+FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
+
+
+# create secrets directory
+RUN mkdir -vp pgp/keys
+
+# create application directory
+RUN mkdir -vp cic-ussd
+RUN mkdir -vp data
+
+COPY requirements.txt .
+
+RUN pip install --index-url https://pypi.org/simple  \
+	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
+    -r requirements.txt
+
+COPY . .
+RUN python setup.py install
+
+COPY cic_ussd/db/ussd_menu.json data/
+
+COPY docker/*.sh .
+RUN chmod +x /root/*.sh
+
+# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
+COPY .config/ /usr/local/etc/cic-ussd/
+COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic
+
+ENTRYPOINT []