Change database name.

Update ci_templates/.cic-template.yml

See merge request grassrootseconomics/cic-internal-integration!61

apps/cic-cache/.config/database.ini

@@ -1,5 +1,5 @@
 [database]
-NAME=cic-eth
+NAME=cic_cache
 USER=postgres
 PASSWORD=
 HOST=localhost

apps/cic-ussd/requirements.txt

@@ -1,21 +1,47 @@
-cic_base[full-graph]~=0.1.1a17
-alembic==1.4.2
-bcrypt==3.2.0
-celery==4.4.7
-chainlib~=0.0.1a20
-cic-eth~=0.10.0a40
-cic-notify~=0.4.0a2
 cic-types==0.1.0a8
-confini~=0.3.6rc3
+alembic==1.4.2
+amqp==2.6.1
+attrs==20.2.0
+bcrypt==3.2.0
+betterpath==0.2.2
+billiard==3.6.3.0
+celery==4.4.7
+cffi==1.14.3
+cic-eth~=0.10.0a22
+cic-notify==0.3.1
+click==7.1.2
+confini~=0.3.6a1
 cryptography==3.2.1
 faker==4.17.1
+iniconfig==1.1.1
+kombu==4.6.11
+Mako==1.1.3
+MarkupSafe==1.1.1
+mirakuru==2.3.0
+more-itertools==8.5.0
+packaging==20.4
 phonenumbers==8.12.12
+pluggy==0.13.1
+port-for==0.4
+psutil==5.7.3
 psycopg2==2.8.6
+py==1.9.0
+pycparser==2.20
+pyparsing==2.4.7
+python-dateutil==2.8.1
+python-editor==1.0.4
 python-gnupg==0.4.6
 python-i18n==0.3.9
+pytz==2020.1
+PyYAML==5.3.1
 redis==3.5.3
 semver==2.13.0
+six==1.15.0
 SQLAlchemy==1.3.20
 tinydb==4.2.0
+toml==0.10.1
 transitions==0.8.4
 uWSGI==2.0.19.1
+vcversioner==2.16.0.0
+vine==1.3.0
+zope.interface==5.1.2

apps/contract-migration/docker/Dockerfile

@@ -127,5 +127,6 @@ COPY contract-migration/from_env.sh from_env.sh
 COPY contract-migration/seed_cic_eth.sh seed_cic_eth.sh
 COPY contract-migration/sarafu_declaration.json sarafu_declaration.json
 COPY contract-migration/keystore keystore
+COPY contract-migration/envlist .
 
-ENTRYPOINT [ "/bin/bash" ]
+# ENTRYPOINT [ "/bin/bash" ]

apps/contract-migration/envlist

@@ -0,0 +1,61 @@
+SYNCER_LOOP_INTERVAL
+SSL_ENABLE_CLIENT
+SSL_CERT_FILE
+SSL_KEY_FILE
+SSL_PASSWORD
+SSL_CA_FILE
+BANCOR_DIR
+REDIS_HOST
+REDIS_PORT
+REDIS_DB
+PGP_EXPORTS_DIR
+PGP_PRIVATEKEY_FILE
+PGP_PASSPHRASE
+DATABASE_USER
+DATABASE_PASSWORD
+DATABASE_NAME
+DATABASE_HOST
+DATABASE_PORT
+DATABASE_ENGINE
+DATABASE_DRIVER
+DATABASE_DEBUG
+TASKS_AFRICASTALKING
+TASKS_SMS_DB
+TASKS_LOG
+TASKS_TRACE_QUEUE_STATUS
+TASKS_TRANSFER_CALLBACKS
+DEV_MNEMONIC
+DEV_ETH_RESERVE_ADDRESS
+DEV_ETH_ACCOUNTS_INDEX_ADDRESS
+DEV_ETH_RESERVE_AMOUNT
+DEV_ETH_ACCOUNT_BANCOR_DEPLOYER
+DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
+DEV_ETH_ACCOUNT_GAS_PROVIDER
+DEV_ETH_ACCOUNT_RESERVE_OWNER
+DEV_ETH_ACCOUNT_RESERVE_MINTER
+DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_OWNER
+DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER
+DEV_ETH_ACCOUNT_SARAFU_OWNER
+DEV_ETH_ACCOUNT_SARAFU_GIFTER
+DEV_ETH_ACCOUNT_APPROVAL_ESCROW_OWNER
+DEV_ETH_ACCOUNT_SINGLE_SHOT_FAUCET_OWNER
+DEV_ETH_SARAFU_TOKEN_NAME
+DEV_ETH_SARAFU_TOKEN_SYMBOL
+DEV_ETH_SARAFU_TOKEN_DECIMALS
+DEV_ETH_SARAFU_TOKEN_ADDRESS
+DEV_PGP_PUBLICKEYS_ACTIVE_FILE
+DEV_PGP_PUBLICKEYS_TRUSTED_FILE
+DEV_PGP_PUBLICKEYS_ENCRYPT_FILE
+CIC_REGISTRY_ADDRESS
+CIC_APPROVAL_ESCROW_ADDRESS
+CIC_TOKEN_INDEX_ADDRESS
+CIC_ACCOUNTS_INDEX_ADDRESS
+CIC_DECLARATOR_ADDRESS
+CIC_CHAIN_SPEC
+ETH_PROVIDER
+ETH_ABI_DIR
+SIGNER_SOCKET_PATH
+SIGNER_SECRET
+CELERY_BROKER_URL
+CELERY_RESULT_URL
+META_PROVIDER

apps/contract-migration/reset.sh

@@ -64,7 +64,7 @@ export CIC_TRUST_ADDRESS=$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
 
 EOF
 
-cat $CIC_DATA_DIR/envlist | bash from_env.sh > $CIC_DATA_DIR/.env_all
+cat ./envlist | bash from_env.sh > $CIC_DATA_DIR/.env_all
 # popd
 
 set +a

ci_templates/.cic-template.yml

@@ -1,54 +1,35 @@
-image: docker:19.03.13
+image:
+  name: gcr.io/kaniko-project/executor:debug
+  entrypoint: [""]
 
 variables:
-    # docker host
+  KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-ttl=24h"
-    DOCKER_HOST: tcp://docker:2376
+  CONTEXT: $CI_PROJECT_DIR/apps/
-    # container, thanks to volume mount from config.toml
-    DOCKER_TLS_CERTDIR: "/certs"
-    # These are usually specified by the entrypoint, however the
-    # Kubernetes executor doesn't run entrypoints
-    # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/4125
-    DOCKER_TLS_VERIFY: 1
-    DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
-    # We are building these from the apps dir to easily share the requirements file there.
-    # It would be nicer to build from the app dir context. TODO figure out a nice way to do this in local DOCKER_TLS_VERIFY
-    CONTEXT: apps/
-
-services:
-  - docker:19.03.13-dind
-
-before_script:
-  - docker info
 
 .py_build_merge_request:
   stage: build
-  before_script:
-    - cd $CONTEXT
   variables:
-    CI_DEBUG_TRACE: "true"
+    - CI_DEBUG_TRACE: "true"
-    IMAGE_TAG: $APP_NAME:$CI_COMMIT_SHORT_SHA
   script:
-    - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --no-push
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
 
 .py_build_push:
-    stage: build
+  stage: build
-    before_script:
+  variables:
-      - cd $CONTEXT
+      IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
-      - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" $CI_REGISTRY --password-stdin
+      LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
-    variables:
+  script:
-        CI_DEBUG_TRACE: "true"
+    - export IMAGE_TAG="$IMAGE_TAG_BASE-$(date +%F.%H%M%S)"
-        IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+    - mkdir -p /kaniko/.docker
-        LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
-    script:
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG
-      - export IMAGE_TAG="$IMAGE_TAG_BASE-$(date +%F.%H%M%S)"
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $CI_REGISTRY_IMAGE/$APP_NAME:latest
-      - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .
+  rules:
-      - docker push $IMAGE_TAG
-      - docker tag $IMAGE_TAG $LATEST_TAG
-      - docker push $LATEST_TAG
-    rules:
       - if: $CI_COMMIT_BRANCH == "master"
         when: always