From f72d577b8c7257898858bf06deabb533f5c50dca Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Tue, 6 Jul 2021 17:30:12 +0000
Subject: [PATCH] Update docker-compose.yml, apps/cic-eth/.gitlab-ci.yml,
 ci_templates/.cic-template.yml files

---
 apps/cic-eth/.gitlab-ci.yml    |  3 ++-
 ci_templates/.cic-template.yml |  2 +-
 docker-compose.yml             | 16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index 16cb6e15..e2dfc69a 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 .cic_eth_variables:
     variables:
         APP_NAME: cic-eth
-        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci
+        DOCKERFILE_PATH: docker/Dockerfile_ci
+        CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME
 
 .cic_eth_changes_target:
     rules:
diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml
index 3f4dd94c..ad4cd82e 100644
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -4,13 +4,13 @@ image:
 
 variables:
   KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h"
-  CONTEXT: $CI_PROJECT_DIR/apps/
 
 .py_build_merge_request:
   stage: build
   variables:
     CI_DEBUG_TRACE: "true"
     IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA
+    CONTEXT: $CI_PROJECT_DIR/apps/
   script:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
diff --git a/docker-compose.yml b/docker-compose.yml
index d2d4d081..375098b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -228,8 +228,8 @@ services:
   cic-eth-tasker:
     # image: grassrootseconomics:cic-eth-service
     build: 
-        context: apps/
-        dockerfile: cic-eth/docker/Dockerfile
+        context: apps/cic-eth
+        dockerfile: docker/Dockerfile
     environment:
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
       ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
@@ -277,8 +277,8 @@ services:
 
   cic-eth-tracker:
     build:
-        context: apps/
-        dockerfile: cic-eth/docker/Dockerfile
+        context: apps/cic-eth
+        dockerfile: docker/Dockerfile
     environment:
       ETH_PROVIDER: http://eth:8545
       DATABASE_USER: ${DATABASE_USER:-grassroots}
@@ -315,8 +315,8 @@ services:
 
   cic-eth-dispatcher:
     build:
-        context: apps/
-        dockerfile: cic-eth/docker/Dockerfile
+        context: apps/cic-eth
+        dockerfile: docker/Dockerfile
     environment:
       ETH_PROVIDER: http://eth:8545
       DATABASE_USER: ${DATABASE_USER:-grassroots}
@@ -355,8 +355,8 @@ services:
 
   cic-eth-retrier:
     build:
-        context: apps/
-        dockerfile: cic-eth/docker/Dockerfile
+        context: apps/cic-eth
+        dockerfile: docker/Dockerfile
     environment:
       ETH_PROVIDER: http://eth:8545
       DATABASE_USER: ${DATABASE_USER:-grassroots}