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

Merge branch 'philip/ussd-notify' into 'master' 

Philip/ussd notify

See merge request grassrootseconomics/cic-internal-integration!11
This commit is contained in:
Blair Vanderlugt 2021-02-10 17:48:24 +00:00
parent 9c9f41ed4c 6051b55b9a
commit 98cdab4353
6 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cic-ussd/.gitlab-ci.yml
View File

@ -18,5 +18,5 @@ build-push-cic-ussd:
extends: extends:
- .py_build_push - .py_build_push
- .cic_ussd_variables - .cic_ussd_variables

2
apps/cic-ussd/docker/Dockerfile
View File

@ -39,6 +39,8 @@ COPY cic-ussd/docker/db.sh \
/root/ /root/
RUN chmod +x /root/*.sh RUN chmod +x /root/*.sh
RUN cd cic-ussd && \
pip install $pip_extra_index_url_flag .
# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts # copy config and migration files to definitive file so they can be referenced in path definitions for running scripts

2
apps/cic-ussd/docker/start_tasker.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
. ./db.sh . /root/db.sh
/usr/local/bin/cic-ussd-tasker -vv "$@" /usr/local/bin/cic-ussd-tasker -vv "$@"

4
apps/cic-ussd/docker/start_uwsgi.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
. ./db.sh . /root/db.sh
/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/server.py --http :80 --pyargv "-vv" /usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/server.py --http :9000 --pyargv "-vv"

4
apps/cic-ussd/requirements.txt
View File

@ -6,10 +6,10 @@ betterpath==0.2.2
billiard==3.6.3.0 billiard==3.6.3.0
celery==4.4.7 celery==4.4.7
cffi==1.14.3 cffi==1.14.3
cic-eth~=0.10.0a9 cic-eth~=0.10.0a22
cic-notify==0.3.1 cic-notify==0.3.1
click==7.1.2 click==7.1.2
confini==0.3.5 confini~=0.3.6a1
cryptography==3.2.1 cryptography==3.2.1
faker==4.17.1 faker==4.17.1
iniconfig==1.1.1 iniconfig==1.1.1

92
docker-compose.yml
View File

@ -458,49 +458,49 @@ services:
- ${LOCAL_VOLUME_DIR:-/tmp/cic}/pgp:/tmp/cic/pgp - ${LOCAL_VOLUME_DIR:-/tmp/cic}/pgp:/tmp/cic/pgp
command: "/root/start_server.sh -vv" command: "/root/start_server.sh -vv"
# cic-ussd-server: cic-ussd-server:
# # image: grassrootseconomics:cic-ussd # image: grassrootseconomics:cic-ussd
# build: build:
# context: apps/ context: apps/
# dockerfile: cic-ussd/docker/Dockerfile dockerfile: cic-ussd/docker/Dockerfile
# environment: environment:
# DATABASE_USER: grassroots DATABASE_USER: grassroots
# DATABASE_HOST: postgres DATABASE_HOST: postgres
# DATABASE_PORT: 5432 DATABASE_PORT: 5432
# DATABASE_PASSWORD: tralala DATABASE_PASSWORD: tralala
# DATABASE_NAME: cic_ussd DATABASE_NAME: cic_ussd
# DATABASE_ENGINE: postgresql DATABASE_ENGINE: postgresql
# DATABASE_DRIVER: psycopg2 DATABASE_DRIVER: psycopg2
# SERVER_PORT: 80 SERVER_PORT: 9000
# ports: ports:
# - 80:8082 - 9000:8082
# depends_on: depends_on:
# - postgres - postgres
# - redis - redis
# deploy: deploy:
# restart_policy: restart_policy:
# condition: on-failure condition: on-failure
# command: "/root/start_uwsgi.sh" command: "/root/start_uwsgi.sh"
#
# cic-ussd-tasker: cic-ussd-tasker:
# # image: grassrootseconomics:cic-ussd # image: grassrootseconomics:cic-ussd
# build: build:
# context: apps context: apps
# dockerfile: cic-ussd/docker/Dockerfile dockerfile: cic-ussd/docker/Dockerfile
# environment: environment:
# DATABASE_USER: grassroots DATABASE_USER: grassroots
# DATABASE_HOST: postgres DATABASE_HOST: postgres
# DATABASE_PORT: 5432 DATABASE_PORT: 5432
# DATABASE_PASSWORD: tralala DATABASE_PASSWORD: tralala
# DATABASE_NAME: cic_ussd DATABASE_NAME: cic_ussd
# DATABASE_ENGINE: postgresql DATABASE_ENGINE: postgresql
# DATABASE_DRIVER: psycopg2 DATABASE_DRIVER: psycopg2
# CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis}
# CELERY_RESULT_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_BROKER_URL:-redis://redis}
# depends_on: depends_on:
# - postgres - postgres
# - redis - redis
# deploy: deploy:
# restart_policy: restart_policy:
# condition: on-failure condition: on-failure
# command: "/root/start_tasker.sh -q cic-ussd" command: "/root/start_tasker.sh -q cic-ussd"