diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml index 34b23b66..983fa19b 100644 --- a/apps/cic-ussd/.gitlab-ci.yml +++ b/apps/cic-ussd/.gitlab-ci.yml @@ -18,5 +18,5 @@ build-push-cic-ussd: extends: - .py_build_push - .cic_ussd_variables - + diff --git a/apps/cic-ussd/docker/Dockerfile b/apps/cic-ussd/docker/Dockerfile index fa9933aa..79d9c5f3 100644 --- a/apps/cic-ussd/docker/Dockerfile +++ b/apps/cic-ussd/docker/Dockerfile @@ -39,6 +39,8 @@ COPY cic-ussd/docker/db.sh \ /root/ 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 diff --git a/apps/cic-ussd/docker/start_tasker.sh b/apps/cic-ussd/docker/start_tasker.sh index b51862ec..bd588f28 100644 --- a/apps/cic-ussd/docker/start_tasker.sh +++ b/apps/cic-ussd/docker/start_tasker.sh @@ -1,5 +1,5 @@ #!/bin/bash -. ./db.sh +. /root/db.sh /usr/local/bin/cic-ussd-tasker -vv "$@" \ No newline at end of file diff --git a/apps/cic-ussd/docker/start_uwsgi.sh b/apps/cic-ussd/docker/start_uwsgi.sh index 2402c455..ac5261cb 100644 --- a/apps/cic-ussd/docker/start_uwsgi.sh +++ b/apps/cic-ussd/docker/start_uwsgi.sh @@ -1,5 +1,5 @@ #!/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" diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index 07f96fd6..f2887130 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -6,10 +6,10 @@ betterpath==0.2.2 billiard==3.6.3.0 celery==4.4.7 cffi==1.14.3 -cic-eth~=0.10.0a9 +cic-eth~=0.10.0a22 cic-notify==0.3.1 click==7.1.2 -confini==0.3.5 +confini~=0.3.6a1 cryptography==3.2.1 faker==4.17.1 iniconfig==1.1.1 diff --git a/docker-compose.yml b/docker-compose.yml index 3751f530..ec427275 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -458,49 +458,49 @@ services: - ${LOCAL_VOLUME_DIR:-/tmp/cic}/pgp:/tmp/cic/pgp command: "/root/start_server.sh -vv" -# cic-ussd-server: -# # image: grassrootseconomics:cic-ussd -# build: -# context: apps/ -# dockerfile: cic-ussd/docker/Dockerfile -# environment: -# DATABASE_USER: grassroots -# DATABASE_HOST: postgres -# DATABASE_PORT: 5432 -# DATABASE_PASSWORD: tralala -# DATABASE_NAME: cic_ussd -# DATABASE_ENGINE: postgresql -# DATABASE_DRIVER: psycopg2 -# SERVER_PORT: 80 -# ports: -# - 80:8082 -# depends_on: -# - postgres -# - redis -# deploy: -# restart_policy: -# condition: on-failure -# command: "/root/start_uwsgi.sh" -# -# cic-ussd-tasker: -# # image: grassrootseconomics:cic-ussd -# build: -# context: apps -# dockerfile: cic-ussd/docker/Dockerfile -# environment: -# DATABASE_USER: grassroots -# DATABASE_HOST: postgres -# DATABASE_PORT: 5432 -# DATABASE_PASSWORD: tralala -# DATABASE_NAME: cic_ussd -# DATABASE_ENGINE: postgresql -# DATABASE_DRIVER: psycopg2 -# CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} -# CELERY_RESULT_URL: ${CELERY_BROKER_URL:-redis://redis} -# depends_on: -# - postgres -# - redis -# deploy: -# restart_policy: -# condition: on-failure -# command: "/root/start_tasker.sh -q cic-ussd" + cic-ussd-server: + # image: grassrootseconomics:cic-ussd + build: + context: apps/ + dockerfile: cic-ussd/docker/Dockerfile + environment: + DATABASE_USER: grassroots + DATABASE_HOST: postgres + DATABASE_PORT: 5432 + DATABASE_PASSWORD: tralala + DATABASE_NAME: cic_ussd + DATABASE_ENGINE: postgresql + DATABASE_DRIVER: psycopg2 + SERVER_PORT: 9000 + ports: + - 9000:8082 + depends_on: + - postgres + - redis + deploy: + restart_policy: + condition: on-failure + command: "/root/start_uwsgi.sh" + + cic-ussd-tasker: + # image: grassrootseconomics:cic-ussd + build: + context: apps + dockerfile: cic-ussd/docker/Dockerfile + environment: + DATABASE_USER: grassroots + DATABASE_HOST: postgres + DATABASE_PORT: 5432 + DATABASE_PASSWORD: tralala + DATABASE_NAME: cic_ussd + DATABASE_ENGINE: postgresql + DATABASE_DRIVER: psycopg2 + CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} + CELERY_RESULT_URL: ${CELERY_BROKER_URL:-redis://redis} + depends_on: + - postgres + - redis + deploy: + restart_policy: + condition: on-failure + command: "/root/start_tasker.sh -q cic-ussd"