kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update docker-compose.yml, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml files

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-07-06 17:30:12 +00:00
parent 068d1112d2
commit f72d577b8c
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/cic-eth/.gitlab-ci.yml
View File

@ -1,7 +1,8 @@
.cic_eth_variables: .cic_eth_variables:
variables: variables:
APP_NAME: cic-eth 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: .cic_eth_changes_target:
rules: rules:

2
ci_templates/.cic-template.yml
View File

@ -4,13 +4,13 @@ image:
variables: variables:
KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h" KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h"
CONTEXT: $CI_PROJECT_DIR/apps/
.py_build_merge_request: .py_build_merge_request:
stage: build stage: build
variables: variables:
CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA
CONTEXT: $CI_PROJECT_DIR/apps/
script: script:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"

16
docker-compose.yml
View File

@ -228,8 +228,8 @@ services:
cic-eth-tasker: cic-eth-tasker:
# image: grassrootseconomics:cic-eth-service # image: grassrootseconomics:cic-eth-service
build: build:
context: apps/ context: apps/cic-eth
dockerfile: cic-eth/docker/Dockerfile dockerfile: docker/Dockerfile
environment: environment:
CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
@ -277,8 +277,8 @@ services:
cic-eth-tracker: cic-eth-tracker:
build: build:
context: apps/ context: apps/cic-eth
dockerfile: cic-eth/docker/Dockerfile dockerfile: docker/Dockerfile
environment: environment:
ETH_PROVIDER: http://eth:8545 ETH_PROVIDER: http://eth:8545
DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_USER: ${DATABASE_USER:-grassroots}
@ -315,8 +315,8 @@ services:
cic-eth-dispatcher: cic-eth-dispatcher:
build: build:
context: apps/ context: apps/cic-eth
dockerfile: cic-eth/docker/Dockerfile dockerfile: docker/Dockerfile
environment: environment:
ETH_PROVIDER: http://eth:8545 ETH_PROVIDER: http://eth:8545
DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_USER: ${DATABASE_USER:-grassroots}
@ -355,8 +355,8 @@ services:
cic-eth-retrier: cic-eth-retrier:
build: build:
context: apps/ context: apps/cic-eth
dockerfile: cic-eth/docker/Dockerfile dockerfile: docker/Dockerfile
environment: environment:
ETH_PROVIDER: http://eth:8545 ETH_PROVIDER: http://eth:8545
DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_USER: ${DATABASE_USER:-grassroots}