From e11e2753e26af68a544e565a2e634155e488b55f Mon Sep 17 00:00:00 2001 From: minhd-vu Date: Mon, 21 Oct 2024 11:48:07 -0400 Subject: [PATCH 1/2] update dockerfiles --- docker/toolbox.Dockerfile | 4 ++-- docker/zkevm-contracts.Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/toolbox.Dockerfile b/docker/toolbox.Dockerfile index 26fea5e8..4790ecd8 100644 --- a/docker/toolbox.Dockerfile +++ b/docker/toolbox.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS polycli-builder +FROM golang:1.22 AS polycli-builder ARG POLYCLI_VERSION WORKDIR /opt/polygon-cli RUN git clone --branch ${POLYCLI_VERSION} https://github.com/maticnetwork/polygon-cli.git . \ @@ -17,7 +17,7 @@ COPY --from=polycli-builder /opt/polygon-cli/bindings /opt/bindings # WARNING (SC1091): (Sourced) file not included in mock. # hadolint ignore=DL3008,DL3013,DL4006,SC1091 RUN apt-get update \ - && apt-get install --yes --no-install-recommends curl git jq pipx \ + && apt-get install --yes --no-install-recommends curl git jq pipx nodejs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && pipx ensurepath \ diff --git a/docker/zkevm-contracts.Dockerfile b/docker/zkevm-contracts.Dockerfile index 92ea5622..af47c4c1 100644 --- a/docker/zkevm-contracts.Dockerfile +++ b/docker/zkevm-contracts.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS polycli-builder +FROM golang:1.22 AS polycli-builder ARG POLYCLI_VERSION WORKDIR /opt/polygon-cli RUN git clone --branch ${POLYCLI_VERSION} https://github.com/maticnetwork/polygon-cli.git . \ From ec31206ad1110c92c5795a8a67031bc4ddeabcd8 Mon Sep 17 00:00:00 2001 From: leovct Date: Mon, 21 Oct 2024 18:20:05 +0200 Subject: [PATCH 2/2] chore: nit --- docs/trigger-a-reorg/network-helper.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/trigger-a-reorg/network-helper.Dockerfile b/docs/trigger-a-reorg/network-helper.Dockerfile index 0a5c3324..8f17df46 100644 --- a/docs/trigger-a-reorg/network-helper.Dockerfile +++ b/docs/trigger-a-reorg/network-helper.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS polycli-builder +FROM golang:1.22 AS polycli-builder WORKDIR /opt/polygon-cli RUN git clone https://github.com/maticnetwork/polygon-cli.git . \ && make build