From e51d9adf7404ab7c78085e2c4e621209b54cd85a Mon Sep 17 00:00:00 2001 From: Mikhail_Linnik1 Date: Wed, 8 May 2024 22:01:14 +0200 Subject: [PATCH] RA-60: Replace NETWORK_MAGIC with PROTOCOL_MAGIC env var --- docker/.env.dockerfile | 4 ++-- docker/Dockerfile | 2 +- docker/entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/.env.dockerfile b/docker/.env.dockerfile index fd77cfa1b..d85f72dfe 100644 --- a/docker/.env.dockerfile +++ b/docker/.env.dockerfile @@ -3,7 +3,7 @@ LOG=INFO NETWORK=preprod DB_SCHEMA=preprod # mainnet, preprod, preview, sanchonet, devkit -NETWORK_MAGIC=1 +PROTOCOL_MAGIC=1 # mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42 ## Postgres variables @@ -40,4 +40,4 @@ YACI_SPRING_PROFILES=postgres INDEXER_NODE_PORT=3001 MEMPOOL_ENABLED=false # Haven't implemented yet -INITIAL_BALANCE_CALCULATION_BLOCK=0 \ No newline at end of file +INITIAL_BALANCE_CALCULATION_BLOCK=0 diff --git a/docker/Dockerfile b/docker/Dockerfile index b0bf1d3a0..26c1b2c68 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -178,7 +178,7 @@ COPY --from=java-builder /root/app/yaci-indexer/target/*.jar /yaci-indexer/app.j # Run RUN mkdir /logs -EXPOSE 8081 +EXPOSE 8080 COPY ./docker/entrypoint.sh /sbin/entrypoint.sh ENTRYPOINT ["/sbin/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 86f1cf12b..7963de444 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -5,7 +5,7 @@ mkdir ${CARDANO_NODE_SOCKET_PATH} cardano-node run --database-path /data/db --host-addr 0.0.0.0 --port ${CARDANO_NODE_PORT} --socket-path ${CARDANO_NODE_SOCKET} --topology /current/topology.json --config /current/config.json > /logs/node.log & echo "entrypoint - run submit api" -cardano-submit-api --config /root/cardano-submit-api/tx-submit-mainnet-config.yaml --socket-path ${CARDANO_NODE_SOCKET} --port ${NODE_SUBMIT_API_PORT} --testnet-magic ${NETWORK_MAGIC} > /logs/submit-api.log & +cardano-submit-api --config /root/cardano-submit-api/tx-submit-mainnet-config.yaml --socket-path ${CARDANO_NODE_SOCKET} --port ${NODE_SUBMIT_API_PORT} --testnet-magic ${PROTOCOL_MAGIC} > /logs/submit-api.log & echo "entrypoint - run postgres" /etc/init.d/postgresql start