From 8b7802a67a364dd0287a6bdc7c90fa6e05de576b Mon Sep 17 00:00:00 2001 From: nolash Date: Sat, 6 Feb 2021 17:26:20 +0100 Subject: [PATCH] Copy keys, add missing vars in docker-compose --- apps/bloxbergValidatorSetup/Dockerfile | 4 +- .../validator/bloxberg.json | 2 +- .../validator/validator.toml | 2 +- docker-compose.yml | 100 +++++++++--------- 4 files changed, 56 insertions(+), 52 deletions(-) diff --git a/apps/bloxbergValidatorSetup/Dockerfile b/apps/bloxbergValidatorSetup/Dockerfile index 96a2168..d268d0a 100644 --- a/apps/bloxbergValidatorSetup/Dockerfile +++ b/apps/bloxbergValidatorSetup/Dockerfile @@ -17,10 +17,12 @@ COPY ./validator/bloxberg.json \ ./validator/validator.toml \ /root/ +COPY ./keys/ /root/keys/ + # RUN chown -R parity:parity $HOME/ && \ # chmod -R 775 $HOME/ && \ # chmod g+s $HOME/ # USER parity ENTRYPOINT [ "parity" ] -CMD [ "--config", "/root/validator.toml", "--keys-path", "/root/keys/" ] \ No newline at end of file +CMD [ "--config", "/root/validator.toml", "--keys-path", "/root/keys/" ] diff --git a/apps/bloxbergValidatorSetup/validator/bloxberg.json b/apps/bloxbergValidatorSetup/validator/bloxberg.json index e3a25dc..5a4414b 100644 --- a/apps/bloxbergValidatorSetup/validator/bloxberg.json +++ b/apps/bloxbergValidatorSetup/validator/bloxberg.json @@ -7,7 +7,7 @@ "maximumUncleCount": 0, "stepDuration": "5", "validators" : { - "list": ["0x0ade5bd2065debbb250e816f614bc342a6ef71c1"] + "list": ["0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5"] } } } diff --git a/apps/bloxbergValidatorSetup/validator/validator.toml b/apps/bloxbergValidatorSetup/validator/validator.toml index ce17d22..45e8f0b 100644 --- a/apps/bloxbergValidatorSetup/validator/validator.toml +++ b/apps/bloxbergValidatorSetup/validator/validator.toml @@ -24,7 +24,7 @@ password = ["/root/validator.pwd"] [mining] #CHANGE ENGINE SIGNER TO VALIDATOR ADDRESS -engine_signer = "0x0ade5bd2065debbb250e816f614bc342a6ef71c1" +engine_signer = "0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5" reseal_on_txs = "none" force_sealing = true min_gas_price = 1000000 diff --git a/docker-compose.yml b/docker-compose.yml index 8c0033e..8242a0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: - 8546 - 30303 volumes: - - ./apps/bloxbergValidatorSetup/keys:/root/keys # stores the signing key locally + #- ./keys:/root/keys # stores the signing key locally - bloxberg-data:/root/.local/share/io.parity.ethereum/ # See contents of /initdb/create_db.sql for app user, password and databases @@ -166,6 +166,7 @@ services: SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1} depends_on: - eth - postgres @@ -304,7 +305,7 @@ services: - -c - | if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi - ./start_dispatcher.sh history -vv + ./start_dispatcher.sh -q cic-eth -vv # command: "/root/start_dispatcher.sh -q cic-eth -vv" @@ -332,6 +333,7 @@ services: SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc} SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} + CIC_TX_RETRY_DELAY: ${CIC_TX_RETRY_DELAY:-30} depends_on: - eth - postgres @@ -346,7 +348,7 @@ services: - -c - | if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi - ./start_retry.sh history -vv + ./start_retry.sh -vv # command: "/root/start_retry.sh -q cic-eth -vv" @@ -453,49 +455,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: 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"