From debe285b692e00bc97114e7a6b562dbf2937d877 Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Wed, 21 Sep 2022 10:36:44 +0100 Subject: [PATCH 1/9] Added docker setup for local env --- Makefile | 9 ++++ docker/local/Dockerfile | 24 ++++++++++ docker/local/docker-compose.yml | 77 +++++++++++++++++++++++++++++++++ docker/local/polygon-edge.sh | 27 ++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 docker/local/Dockerfile create mode 100644 docker/local/docker-compose.yml create mode 100755 docker/local/polygon-edge.sh diff --git a/Makefile b/Makefile index 190aa3b9f6..da66898a30 100644 --- a/Makefile +++ b/Makefile @@ -37,3 +37,12 @@ test: go build -o artifacts/polygon-edge . $(eval export PATH=$(shell pwd)/artifacts:$(PATH)) go test -timeout 28m ./... + +.PHONY: run-local +run-local: + docker-compose -f ./docker/local/docker-compose.yml up -d + +.PHONY: stop-local +stop-local: + docker-compose -f ./docker/local/docker-compose.yml stop + diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile new file mode 100644 index 0000000000..5e1050c724 --- /dev/null +++ b/docker/local/Dockerfile @@ -0,0 +1,24 @@ +FROM golang:1.18-alpine AS builder + +WORKDIR /polygon-edge + +ADD go.mod go.sum ./ +RUN go mod download + +COPY . . + +RUN go build -o polygon-edge main.go + +FROM alpine:latest AS runner + +RUN apk --no-cache add ca-certificates + +WORKDIR /polygon-edge + +COPY --from=builder /polygon-edge/polygon-edge ./ +COPY ./docker/local/polygon-edge.sh ./ + +# Expose json-rpc, libp2p and grpc ports +EXPOSE 8545 9632 1478 + +ENTRYPOINT ["./polygon-edge.sh"] \ No newline at end of file diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml new file mode 100644 index 0000000000..3472a30e88 --- /dev/null +++ b/docker/local/docker-compose.yml @@ -0,0 +1,77 @@ +version: '3.5' + +services: + ## INITIALIZE GENESIS AND SECRETS + init: + build: + context: ../../ + dockerfile: docker/local/Dockerfile + command: ["init"] + volumes: + - node-1:/data1 + - node-2:/data2 + - node-3:/data3 + - node-4:/data4 + - genesis:/genesis + network_mode: host + + ## RUN NODES + ## Nodes must have the same names as folders in genesis-legde + node-1: + build: + context: ../../ + dockerfile: docker/local/Dockerfile + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":10000", "--libp2p", ":10001", "--jsonrpc", ":10002", "--seal"] + depends_on: + - init + volumes: + - node-1:/data + - genesis:/genesis + network_mode: host + restart: on-failure + + node-2: + build: + context: ../../ + dockerfile: docker/local/Dockerfile + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":20000", "--libp2p", ":20001", "--jsonrpc", ":20002", "--seal"] + depends_on: + - init + volumes: + - node-2:/data + - genesis:/genesis + network_mode: host + restart: on-failure + + node-3: + build: + context: ../../ + dockerfile: docker/local/Dockerfile + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":30000", "--libp2p", ":30001", "--jsonrpc", ":30002", "--seal"] + depends_on: + - init + volumes: + - node-3:/data + - genesis:/genesis + network_mode: host + restart: on-failure + + node-4: + build: + context: ../../ + dockerfile: docker/local/Dockerfile + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":40000", "--libp2p", ":40001", "--jsonrpc", ":40002", "--seal"] + depends_on: + - init + volumes: + - node-4:/data + - genesis:/genesis + network_mode: host + restart: on-failure + +volumes: + node-1: + node-2: + node-3: + node-4: + genesis: diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh new file mode 100755 index 0000000000..a4b413ac80 --- /dev/null +++ b/docker/local/polygon-edge.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +POLYGON_EDGE_BIN=./polygon-edge + +case "$1" in + + "init") + echo "Generating secrets..." + node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data1 | grep Node | awk -F ' ' '{print $4}') + node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data2 | grep Node | awk -F ' ' '{print $4}') + node3id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data3 | grep Node | awk -F ' ' '{print $4}') + node4id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data4 | grep Node | awk -F ' ' '{print $4}') + echo "Secrets have been successfully generated" + + echo "Generating genesis file..." + "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path test-chain- --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" + echo "Genesis file has been successfully generated" + ;; + + *) + echo "Executing polygon-edge..." + exec "$POLYGON_EDGE_BIN" "$@" + ;; + +esac From b93e73597bf0cdf50eba78c14033158053e46422 Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Wed, 21 Sep 2022 12:22:39 +0100 Subject: [PATCH 2/9] Minor update --- docker/local/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 5e1050c724..ffb4b42257 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -21,4 +21,4 @@ COPY ./docker/local/polygon-edge.sh ./ # Expose json-rpc, libp2p and grpc ports EXPOSE 8545 9632 1478 -ENTRYPOINT ["./polygon-edge.sh"] \ No newline at end of file +ENTRYPOINT ["./polygon-edge.sh"] From ce265270e5a4a6aac841912e71bba9518e32b50c Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Wed, 21 Sep 2022 14:47:21 +0100 Subject: [PATCH 3/9] Minor update --- docker/local/polygon-edge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index a4b413ac80..26a42c10db 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -10,12 +10,12 @@ case "$1" in echo "Generating secrets..." node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data1 | grep Node | awk -F ' ' '{print $4}') node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data2 | grep Node | awk -F ' ' '{print $4}') - node3id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data3 | grep Node | awk -F ' ' '{print $4}') - node4id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data4 | grep Node | awk -F ' ' '{print $4}') + "$POLYGON_EDGE_BIN" secrets init --data-dir /data3 | grep Node | awk -F ' ' '{print $4}' + "$POLYGON_EDGE_BIN" secrets init --data-dir /data4 | grep Node | awk -F ' ' '{print $4}' echo "Secrets have been successfully generated" echo "Generating genesis file..." - "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path test-chain- --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" + "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path data --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" echo "Genesis file has been successfully generated" ;; From 9533dacde9e5a0c2e0f1e3c00cff464b1dc31611 Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Thu, 22 Sep 2022 10:19:33 +0100 Subject: [PATCH 4/9] Added .dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..c908ba9234 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +docker/local/Dockerfile From 23371800de7be42c6b5ce1c0ee9c6e3514ad798d Mon Sep 17 00:00:00 2001 From: Epikichi <78609649+epikichi@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:33:55 -0400 Subject: [PATCH 5/9] Adding switching volumes mount target for genesis (#754) --- docker/local/docker-compose.yml | 8 ++++---- docker/local/polygon-edge.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index 3472a30e88..adcdf8ac44 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -8,10 +8,10 @@ services: dockerfile: docker/local/Dockerfile command: ["init"] volumes: - - node-1:/data1 - - node-2:/data2 - - node-3:/data3 - - node-4:/data4 + - node-1:/polygon-edge/data-1 + - node-2:/polygon-edge/data-2 + - node-3:/polygon-edge/data-3 + - node-4:/polygon-edge/data-4 - genesis:/genesis network_mode: host diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index 26a42c10db..9cf5290256 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -8,14 +8,14 @@ case "$1" in "init") echo "Generating secrets..." - node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data1 | grep Node | awk -F ' ' '{print $4}') - node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir /data2 | grep Node | awk -F ' ' '{print $4}') - "$POLYGON_EDGE_BIN" secrets init --data-dir /data3 | grep Node | awk -F ' ' '{print $4}' - "$POLYGON_EDGE_BIN" secrets init --data-dir /data4 | grep Node | awk -F ' ' '{print $4}' + node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 | grep Node | awk -F ' ' '{print $4}') + node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 | grep Node | awk -F ' ' '{print $4}') + "$POLYGON_EDGE_BIN" secrets init --data-dir data-3 | grep Node | awk -F ' ' '{print $4}' + "$POLYGON_EDGE_BIN" secrets init --data-dir data-4 | grep Node | awk -F ' ' '{print $4}' echo "Secrets have been successfully generated" echo "Generating genesis file..." - "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path data --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" + "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path data- --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" echo "Genesis file has been successfully generated" ;; From b66588118041b56ca3c0da03cff5b6680ba69c1c Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Thu, 22 Sep 2022 15:15:48 +0100 Subject: [PATCH 6/9] Minor updates --- Makefile | 2 +- docker/local/docker-compose.yml | 28 +++++++++++++++++++--------- docker/local/polygon-edge.sh | 11 ++++++++--- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index da66898a30..47b1a962c4 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ test: .PHONY: run-local run-local: - docker-compose -f ./docker/local/docker-compose.yml up -d + docker-compose -f ./docker/local/docker-compose.yml up -d --build .PHONY: stop-local stop-local: diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index adcdf8ac44..ec766c5e85 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -13,7 +13,8 @@ services: - node-3:/polygon-edge/data-3 - node-4:/polygon-edge/data-4 - genesis:/genesis - network_mode: host + networks: + - polygon-edge-docker ## RUN NODES ## Nodes must have the same names as folders in genesis-legde @@ -21,54 +22,63 @@ services: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":10000", "--libp2p", ":10001", "--jsonrpc", ":10002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] depends_on: - init volumes: - node-1:/data - genesis:/genesis - network_mode: host + networks: + - polygon-edge-docker restart: on-failure node-2: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":20000", "--libp2p", ":20001", "--jsonrpc", ":20002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] depends_on: - init volumes: - node-2:/data - genesis:/genesis - network_mode: host + networks: + - polygon-edge-docker restart: on-failure node-3: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":30000", "--libp2p", ":30001", "--jsonrpc", ":30002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] depends_on: - init volumes: - node-3:/data - genesis:/genesis - network_mode: host + networks: + - polygon-edge-docker restart: on-failure node-4: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", ":40000", "--libp2p", ":40001", "--jsonrpc", ":40002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] depends_on: - init volumes: - node-4:/data - genesis:/genesis - network_mode: host + networks: + - polygon-edge-docker restart: on-failure +networks: + polygon-edge-docker: + driver: bridge + name: polygon-edge-docker + volumes: node-1: node-2: diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index 9cf5290256..59894441ea 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -10,12 +10,17 @@ case "$1" in echo "Generating secrets..." node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 | grep Node | awk -F ' ' '{print $4}') node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 | grep Node | awk -F ' ' '{print $4}') - "$POLYGON_EDGE_BIN" secrets init --data-dir data-3 | grep Node | awk -F ' ' '{print $4}' - "$POLYGON_EDGE_BIN" secrets init --data-dir data-4 | grep Node | awk -F ' ' '{print $4}' + "$POLYGON_EDGE_BIN" secrets init --data-dir data-3 + "$POLYGON_EDGE_BIN" secrets init --data-dir data-4 echo "Secrets have been successfully generated" echo "Generating genesis file..." - "$POLYGON_EDGE_BIN" genesis --dir /genesis/genesis.json --consensus ibft --ibft-validators-prefix-path data- --bootnode /ip4/127.0.0.1/tcp/10001/p2p/"$node1id" --bootnode /ip4/127.0.0.1/tcp/20001/p2p/"$node2id" + "$POLYGON_EDGE_BIN" genesis \ + --dir /genesis/genesis.json \ + --consensus ibft \ + --ibft-validators-prefix-path data- \ + --bootnode /dns4/node-1/tcp/10001/p2p/"$node1id" \ + --bootnode /dns4/node-2/tcp/10001/p2p/"$node2id" echo "Genesis file has been successfully generated" ;; From de83362f6e995a26e5a72a395d82d0dc4cf03e66 Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Thu, 22 Sep 2022 17:13:26 +0100 Subject: [PATCH 7/9] Minor updates --- docker/local/docker-compose.yml | 20 ++++++++++++++++---- docker/local/polygon-edge.sh | 4 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index ec766c5e85..e5d89103c9 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -22,9 +22,12 @@ services: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--seal"] depends_on: - init + ports: + - '10000:9632' + - '10002:8545' volumes: - node-1:/data - genesis:/genesis @@ -36,9 +39,12 @@ services: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--seal"] depends_on: - init + ports: + - '20000:9632' + - '20002:8545' volumes: - node-2:/data - genesis:/genesis @@ -50,9 +56,12 @@ services: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--seal"] depends_on: - init + ports: + - '30000:9632' + - '30002:8545' volumes: - node-3:/data - genesis:/genesis @@ -64,9 +73,12 @@ services: build: context: ../../ dockerfile: docker/local/Dockerfile - command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:10000", "--libp2p", "0.0.0.0:10001", "--jsonrpc", "0.0.0.0:10002", "--seal"] + command: ["server", "--data-dir", "/data", "--chain", "/genesis/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--seal"] depends_on: - init + ports: + - '40000:9632' + - '40002:8545' volumes: - node-4:/data - genesis:/genesis diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index 59894441ea..cae7e26cd5 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -19,8 +19,8 @@ case "$1" in --dir /genesis/genesis.json \ --consensus ibft \ --ibft-validators-prefix-path data- \ - --bootnode /dns4/node-1/tcp/10001/p2p/"$node1id" \ - --bootnode /dns4/node-2/tcp/10001/p2p/"$node2id" + --bootnode /dns4/node-1/tcp/1478/p2p/"$node1id" \ + --bootnode /dns4/node-2/tcp/1478/p2p/"$node2id" echo "Genesis file has been successfully generated" ;; From 9d08da22bdee13df8204dac6c4fc8772ae9f0f6b Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Fri, 23 Sep 2022 08:52:47 +0100 Subject: [PATCH 8/9] Minor updates --- docker/local/Dockerfile | 4 ++-- docker/local/polygon-edge.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index ffb4b42257..19d8b2bdb2 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine AS builder +FROM golang:1.17-alpine AS builder WORKDIR /polygon-edge @@ -11,7 +11,7 @@ RUN go build -o polygon-edge main.go FROM alpine:latest AS runner -RUN apk --no-cache add ca-certificates +RUN apk --no-cache add ca-certificates jq WORKDIR /polygon-edge diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index cae7e26cd5..44f081d709 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -8,8 +8,8 @@ case "$1" in "init") echo "Generating secrets..." - node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 | grep Node | awk -F ' ' '{print $4}') - node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 | grep Node | awk -F ' ' '{print $4}') + node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 | jq -r '.node_id') + node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 | jq -r '.node_id') "$POLYGON_EDGE_BIN" secrets init --data-dir data-3 "$POLYGON_EDGE_BIN" secrets init --data-dir data-4 echo "Secrets have been successfully generated" From 86534ad807124663712b4c20873a32a7bd7d646c Mon Sep 17 00:00:00 2001 From: Roman Behma Date: Fri, 23 Sep 2022 08:53:17 +0100 Subject: [PATCH 9/9] Minor updates --- docker/local/polygon-edge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh index 44f081d709..1b11b2fb6e 100755 --- a/docker/local/polygon-edge.sh +++ b/docker/local/polygon-edge.sh @@ -8,8 +8,8 @@ case "$1" in "init") echo "Generating secrets..." - node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 | jq -r '.node_id') - node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 | jq -r '.node_id') + node1id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-1 --json | jq -r '.node_id') + node2id=$("$POLYGON_EDGE_BIN" secrets init --data-dir data-2 --json | jq -r '.node_id') "$POLYGON_EDGE_BIN" secrets init --data-dir data-3 "$POLYGON_EDGE_BIN" secrets init --data-dir data-4 echo "Secrets have been successfully generated"