Merge remote-tracking branch 'origin/master' into lash/chainlib-erc20-split

.gitlab-ci.yml

@@ -6,7 +6,6 @@ include:
   - local: 'apps/cic-notify/.gitlab-ci.yml'
   - local: 'apps/cic-meta/.gitlab-ci.yml'
   - local: 'apps/cic-cache/.gitlab-ci.yml'
-  - local: 'apps/contract-migration/scripts/.gitlab-ci.yml'
 
 stages:
   - build

apps/contract-migration/scripts/.gitlab-ci.yml

@@ -1,14 +0,0 @@
-.scripts_variables:
-    variables:
-        APP_DIR: contract-migrations
-        APP_NAME: scripts
-        DOCKERFILE_PATH: $APP_DIR/$APP_NAME/docker/Dockerfile
-
-.scripts_changes_target:
-    rules:
-        - changes:
-            - $CONTEXT/$APP_DIR/$APP_NAME
-
-build-mr-scripts:
-  script:
-    - python create_import_users.py -v -c config --gift-threshold 10000 100

apps/contract-migration/scripts/docker/Dockerfile

@@ -1,6 +0,0 @@
-FROM python:3.8.5-slim-buster
-
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends git gcc g++ libpq-dev gawk jq telnet wget openssl iputils-ping gnupg socat bash procps make python2 cargo
-RUN pip install pip
-RUN pip install --extra-index-url https://pip.grassrootseconomics.net:8433 -r requirements.txt

ci_templates/.cic-template.yml

@@ -3,7 +3,7 @@ image:
   entrypoint: [""]
 
 variables:
-  KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h"
+  KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-ttl=24h"
   CONTEXT: $CI_PROJECT_DIR/apps/
 
 .py_build_merge_request: