grassrootseconomics/cic-stack
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Copy keys, add missing vars in docker-compose

Browse Source
This commit is contained in:
nolash 2021-02-06 17:26:20 +01:00
parent 4d2b3cb639
commit 8b7802a67a
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/bloxbergValidatorSetup/Dockerfile
View File

@ -17,6 +17,8 @@ COPY ./validator/bloxberg.json \
./validator/validator.toml \ ./validator/validator.toml \
/root/ /root/
COPY ./keys/ /root/keys/
# RUN chown -R parity:parity $HOME/ && \ # RUN chown -R parity:parity $HOME/ && \
# chmod -R 775 $HOME/ && \ # chmod -R 775 $HOME/ && \
# chmod g+s $HOME/ # chmod g+s $HOME/

2
apps/bloxbergValidatorSetup/validator/bloxberg.json
View File

@ -7,7 +7,7 @@
"maximumUncleCount": 0, "maximumUncleCount": 0,
"stepDuration": "5", "stepDuration": "5",
"validators" : { "validators" : {
"list": ["0x0ade5bd2065debbb250e816f614bc342a6ef71c1"] "list": ["0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5"]
} }
} }
} }

2
apps/bloxbergValidatorSetup/validator/validator.toml
View File

@ -24,7 +24,7 @@ password = ["/root/validator.pwd"]
[mining] [mining]
#CHANGE ENGINE SIGNER TO VALIDATOR ADDRESS #CHANGE ENGINE SIGNER TO VALIDATOR ADDRESS
engine_signer = "0x0ade5bd2065debbb250e816f614bc342a6ef71c1" engine_signer = "0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5"
reseal_on_txs = "none" reseal_on_txs = "none"
force_sealing = true force_sealing = true
min_gas_price = 1000000 min_gas_price = 1000000

100
docker-compose.yml
View File

@ -39,7 +39,7 @@ services:
- 8546 - 8546
- 30303 - 30303
volumes: 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/ - bloxberg-data:/root/.local/share/io.parity.ethereum/
# See contents of /initdb/create_db.sql for app user, password and databases # 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_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc}
SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
depends_on: depends_on:
- eth - eth
- postgres - postgres
@ -304,7 +305,7 @@ services:
- -c - -c
- | - |
if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 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" # 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_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-/tmp/cic/signer/jsonrpc.ipc}
SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
CIC_TX_RETRY_DELAY: ${CIC_TX_RETRY_DELAY:-30}
depends_on: depends_on:
- eth - eth
- postgres - postgres
@ -346,7 +348,7 @@ services:
- -c - -c
- | - |
if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 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" # command: "/root/start_retry.sh -q cic-eth -vv"
@ -453,49 +455,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: 80
ports: # ports:
- 80:8082 # - 80: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"