diff --git a/docker-compose.yml b/docker-compose.yml index 82ab05e4..36cd8a76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,8 +35,8 @@ services: context: apps/bloxbergValidatorSetup restart: unless-stopped ports: - - ${DEV_ETH_PORT_HTTP:-8545}:8545 - - ${DEV_ETH_PORT_WS-8546}:8546 + - ${DEV_ETH_PORT_HTTP:-63545}:8545 + - ${DEV_ETH_PORT_WS-63546}:8546 - 30303 volumes: - ./apps/bloxbergValidatorSetup/keys:/root/keys # stores the signing key locally @@ -49,7 +49,7 @@ services: POSTGRES_HOST_AUTH_METHOD: trust # for postgres user access w/o password. Obvioulsy not safe but allows easy elevated debugging. # PGDATA: /tmp/cic/postgres ports: - - ${DEV_POSTGRES_PORT:-5432}:5432 + - ${DEV_POSTGRES_PORT:-63432}:5432 volumes: - ./scripts/initdb/create_db.sql:/docker-entrypoint-initdb.d/1-create_all_db.sql - ./apps/cic-meta/scripts/initdb/postgresql.sh:/docker-entrypoint-initdb.d/2-init-cic-meta.sh @@ -58,7 +58,7 @@ services: redis: image: redis:6.0.9-alpine ports: - - ${DEV_REDIS_PORT:-6379}:6379 + - ${DEV_REDIS_PORT:-63379}:6379 command: "--loglevel verbose" bee: @@ -68,8 +68,8 @@ services: BEE_NETWORK_ID: ${BEE_NETWORK_ID:-313} BEE_PASSWORD: ${BEE_PASSWORD:-password} ports: - - ${DEV_BEE_PORT:-1633}:1633 - - ${DEV_BEE_PORT_DEBUG:-1635}:1635 + - ${DEV_BEE_PORT:-63633}:1633 + - ${DEV_BEE_PORT_DEBUG:-63635}:1635 command: "start --swap-enable=false --standalone" volumes: - bee-data:/tmp/cic/bee @@ -374,11 +374,13 @@ 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 - redis + ports: + - ${HTTP_PORT_CIC_ETH:-63314}:8000 deploy: restart_policy: condition: on-failure @@ -439,8 +441,8 @@ services: DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PORT: ${DATABASE_PORT:-5432} - SERVER_HOST: ${SERVER_HOST:-localhost} - SERVER_PORT: ${SERVER_HOST:-80} + SERVER_HOST: localhost + SERVER_PORT: 8000 DATABASE_SCHEMA_SQL_PATH: "" PGP_EXPORTS_DIR: /tmp/src/cic-meta/tests/ PGP_PRIVATEKEY_FILE: privatekeys.asc @@ -449,7 +451,7 @@ services: PGP_PUBLICKEY_ACTIVE_FILE: publickeys.asc PGP_PUBLICKEY_ENCRYPT_FILE: publickeys.asc ports: - - ${HTTP_PORT_CIC_META:-63380}:${SERVER_PORT:-80} + - ${HTTP_PORT_CIC_META:-63380}:8000 depends_on: - postgres deploy: @@ -472,9 +474,9 @@ services: DATABASE_NAME: cic_ussd DATABASE_ENGINE: postgresql DATABASE_DRIVER: psycopg2 - SERVER_PORT: 9000 + SERVER_PORT: 8000 ports: - - 9000:8082 + - ${HTTP_PORT_CIC_USSD:-63315}:8000 depends_on: - postgres - redis