From a07b77785a3ac275a39b23edb17afb81392cf1dc Mon Sep 17 00:00:00 2001 From: Jeb Bearer Date: Fri, 19 Jan 2024 10:51:41 -0500 Subject: [PATCH] Pin to gibraltar release --- .github/workflows/contracts-docker.yml | 4 +++- docker-compose-geth.yaml | 2 +- docker/node.Dockerfile | 2 +- justfile | 4 ++-- scripts/build-docker-images | 8 ++++---- services.yaml | 8 ++++---- zkevm-node | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/contracts-docker.yml b/.github/workflows/contracts-docker.yml index 687a98e..6573a07 100644 --- a/.github/workflows/contracts-docker.yml +++ b/.github/workflows/contracts-docker.yml @@ -2,7 +2,9 @@ name: Build contracts docker image on: push: - branches: [main] + branches: + - main + - release-* tags: - 'v*' pull_request: diff --git a/docker-compose-geth.yaml b/docker-compose-geth.yaml index 04c0b59..5ca8897 100644 --- a/docker-compose-geth.yaml +++ b/docker-compose-geth.yaml @@ -4,7 +4,7 @@ services: # This image is pinned because the deployment step is not deterministic. The # block number at which the contracts are deployed changes between runs. # image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts@sha256:8dfb508b77af42e511553e609fa6e0ef68818852737085f40cc5c769dc0ccf96 - image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts:main + image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts:release-gibraltar command: [ "--verbosity", "2", diff --git a/docker/node.Dockerfile b/docker/node.Dockerfile index b5def3d..b4f4951 100644 --- a/docker/node.Dockerfile +++ b/docker/node.Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/espressosystems/zkevm-node:hotshot-integration +FROM ghcr.io/espressosystems/zkevm-node:release-gibraltar RUN apk add aws-cli bash curl ADD ./zkevm-node/test/aggregator.keystore /pk/aggregator.keystore ADD ./zkevm-node/test/sequencer.keystore /pk/sequencer.keystore diff --git a/justfile b/justfile index d118056..dd7c480 100644 --- a/justfile +++ b/justfile @@ -67,14 +67,14 @@ anvil *args: docker run ghcr.io/foundry-rs/foundry:latest "anvil {{args}}" build-docker-zkevm-node: - cd zkevm-node && nix develop -c bash -c "make build-docker && docker tag zkevm-node:latest ghcr.io/espressosystems/zkevm-node:hotshot-integration" + cd zkevm-node && nix develop -c bash -c "make build-docker && docker tag zkevm-node:latest ghcr.io/espressosystems/zkevm-node:release-gibraltar" build-docker-zkevm-adaptor: scripts/build-docker-images build-docker-l1-geth: scripts/build-l1-image - docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts:main -f docker/geth.Dockerfile . + docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts:release-gibraltar -f docker/geth.Dockerfile . build-docker: build-docker-l1-geth build-docker-zkevm-node build-docker-zkevm-adaptor diff --git a/scripts/build-docker-images b/scripts/build-docker-images index 826d4f0..2af541b 100755 --- a/scripts/build-docker-images +++ b/scripts/build-docker-images @@ -3,7 +3,7 @@ set -e nix develop .#crossShell --ignore-environment --keep HOME --command cargo build --release -docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/polygon-zkevm-adaptor:main -f docker/polygon-zkevm-adaptor.Dockerfile . -docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/state-db:main -f docker/state-db.Dockerfile . -docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/zkevm-node:main -f docker/node.Dockerfile . -docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/zkevm-prover:main -f docker/prover.Dockerfile . \ No newline at end of file +docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/polygon-zkevm-adaptor:release-gibraltar -f docker/polygon-zkevm-adaptor.Dockerfile . +docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/state-db:release-gibraltar -f docker/state-db.Dockerfile . +docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/zkevm-node:release-gibraltar -f docker/node.Dockerfile . +docker build -t ghcr.io/espressosystems/espresso-polygon-zkevm-demo/zkevm-prover:release-gibraltar -f docker/prover.Dockerfile . \ No newline at end of file diff --git a/services.yaml b/services.yaml index a1dc9fc..32c68b2 100644 --- a/services.yaml +++ b/services.yaml @@ -1,7 +1,7 @@ version: "3" services: aggregator: - image: ghcr.io/espressosystems/zkevm-node:hotshot-integration + image: ghcr.io/espressosystems/zkevm-node:release-gibraltar expose: - 50081 - 9091 # needed if metrics enabled @@ -58,7 +58,7 @@ services: retries: 20 permissionless-node: - image: ghcr.io/espressosystems/zkevm-node:hotshot-integration + image: ghcr.io/espressosystems/zkevm-node:release-gibraltar environment: - ZKEVM_NODE_TRUSTED=false - ZKEVM_NODE_STATEDB_USER=state_user @@ -85,7 +85,7 @@ services: - "host.docker.internal:host-gateway" eth-tx-manager: - image: ghcr.io/espressosystems/zkevm-node:hotshot-integration + image: ghcr.io/espressosystems/zkevm-node:release-gibraltar environment: - ZKEVM_NODE_STATEDB_USER=state_user - ZKEVM_NODE_STATEDB_PASSWORD=state_password @@ -131,7 +131,7 @@ services: stop_grace_period: 1s adaptor: - image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/polygon-zkevm-adaptor:main + image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/polygon-zkevm-adaptor:release-gibraltar environment: - ESPRESSO_SEQUENCER_URL - ESPRESSO_ZKEVM_L1_PROVIDER diff --git a/zkevm-node b/zkevm-node index 5931dcf..d4a1c78 160000 --- a/zkevm-node +++ b/zkevm-node @@ -1 +1 @@ -Subproject commit 5931dcfa48c29479e5e5c1dd5add0860abdc2af5 +Subproject commit d4a1c78b3f9a5095f0951876b0eed569071feb48