Correct host facing ports on docker compose

Philip/ussd notify

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

apps/cic-ussd/.gitlab-ci.yml

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

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

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 "$@"

apps/cic-ussd/docker/start_uwsgi.sh

@@ -1,5 +1,6 @@
 #!/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"
+echo "pooooort $SERVER_PORT"
+/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/server.py --http :$SERVER_PORT --pyargv "-vv"

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

docker-compose.yml

@@ -37,7 +37,7 @@ services:
     ports:
       - ${DEV_ETH_PORT_HTTP:-8545}:8545
       - ${DEV_ETH_PORT_WS-8546}:8546
-      - 30303
+        #- 30303:30303
     volumes:
       #- ./keys:/root/keys # stores the signing key locally
       - bloxberg-data:/root/.local/share/io.parity.ethereum/
@@ -373,7 +373,7 @@ services:
       CIC_CHAIN_SPEC: $CIC_CHAIN_SPEC
       CELERY_BROKER_URL: $CELERY_BROKER_URL
       CELERY_RESULT_URL: $CELERY_RESULT_URL
-      SERVER_PORT: 80
+      SERVER_PORT: 8000
     depends_on:
       - eth
       - postgres
@@ -383,6 +383,8 @@ services:
         condition: on-failure
     volumes:
         - contract-config:/tmp/cic/config/:ro
+    ports: 
+      - ${HTTP_PORT_CIC_ETH:-63314}:8000
     command:
       - /bin/bash
       - -c
@@ -458,49 +460,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: 8000
+    ports:
+      - ${HTTP_PORT_CIC_USSD:-63315}:8000
+    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"