From da98b22ad145d4b7b89b815fc8a6d57c504fb9f8 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Mon, 30 Aug 2021 13:47:25 -0700 Subject: [PATCH] init --- apps/data-seeding/import_ussd.sh | 2 ++ docker-compose.auth.yml | 16 ++++++++++++++++ docker-compose.yml | 1 + 3 files changed, 19 insertions(+) create mode 100644 docker-compose.auth.yml diff --git a/apps/data-seeding/import_ussd.sh b/apps/data-seeding/import_ussd.sh index 02773481..2e5be626 100644 --- a/apps/data-seeding/import_ussd.sh +++ b/apps/data-seeding/import_ussd.sh @@ -33,7 +33,9 @@ then else python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$IMPORT_DIR" fi + echo "Waiting for import balance job to complete ..." + tail --pid="$IMPORT_BALANCE_JOB" -f /dev/null set -e echo "Importing pins" diff --git a/docker-compose.auth.yml b/docker-compose.auth.yml new file mode 100644 index 00000000..d514e65b --- /dev/null +++ b/docker-compose.auth.yml @@ -0,0 +1,16 @@ +services: + cic-frontend-auth: + image: registry.gitlab.com/grassrootseconomics/cic-auth-proxy:latest + environment: + GPG_TRUSTED_PUBLICKEY_FINGERPRINT: CCE2E1D2D0E36ADE0405E2D0995BB21816313BD5 + GPG_IMPORT_DIR: /usr/src/cic-auth-proxy/meta/tests/testdata/dev/ + GPG_PUBLICKEY_FILENAME: publickeys.asc + GPG_SIGNATURE_FILENAME: signature.asc + PROXY_HOST: cic-meta-server + PROXY_PORT: 80 + PROXY_PROTO: http + PROXY_PATH_PREFIX: "/" + HOMEDIR: .gnupg + ports: + - 8080:80 + diff --git a/docker-compose.yml b/docker-compose.yml index d61cab55..894a3f0c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -117,6 +117,7 @@ services: volumes: - contract-config:/tmp/cic/config + cic-cache-tracker: image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-cache:${TAG:-latest} profiles: