From bef5b0f8cf67a3ebe7b09cb6ff87f62ba85b8abf Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 22 Dec 2023 13:57:54 +0100 Subject: [PATCH 1/4] CI: disable docker gha cache --- .github/actions/docker-image/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-image/action.yml b/.github/actions/docker-image/action.yml index f0cc8ac781..0f2fe8ce19 100644 --- a/.github/actions/docker-image/action.yml +++ b/.github/actions/docker-image/action.yml @@ -40,8 +40,8 @@ runs: target: ${{ inputs.target }} labels: ${{ steps.metadata.outputs.labels }} platforms: ${{ inputs.platforms }} - cache-from: type=gha - cache-to: type=gha,mode=max + # cache-from: type=gha + # cache-to: type=gha,mode=max outputs: type=image,name=${{ inputs.images }},push-by-digest=true,name-canonical=true,push=true - name: Export digest From 0aefa5bf10837a42193bc57b3390ece147a62977 Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 22 Dec 2023 14:44:11 +0100 Subject: [PATCH 2/4] Add changes from upstream Dockerfile --- Dockerfile.espresso | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.espresso b/Dockerfile.espresso index f3c3bb122c..fa6e802d01 100644 --- a/Dockerfile.espresso +++ b/Dockerfile.espresso @@ -33,7 +33,7 @@ RUN apt-get update && \ apt-get install -y git python3 make g++ WORKDIR /workspace COPY contracts/package.json contracts/yarn.lock contracts/ -RUN cd contracts && yarn install --ignore-optional +RUN cd contracts && yarn install COPY contracts contracts/ COPY Makefile . RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-solidity @@ -81,6 +81,7 @@ COPY ./fastcache ./fastcache COPY ./go-ethereum ./go-ethereum COPY --from=brotli-wasm-export / target/ COPY --from=contracts-builder workspace/contracts/build/contracts/src/precompiles/ contracts/build/contracts/src/precompiles/ +COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/ COPY --from=contracts-builder workspace/.make/ .make/ RUN PATH="$PATH:/usr/local/go/bin" NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-wasm-bin @@ -176,6 +177,7 @@ COPY fastcache/go.mod fastcache/go.sum fastcache/ RUN go mod download COPY . ./ COPY --from=contracts-builder workspace/contracts/build/ contracts/build/ +COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/ COPY --from=contracts-builder workspace/.make/ .make/ COPY --from=prover-header-export / target/ COPY --from=brotli-library-export / target/ From 3b254903e55709afd7d31a83fc41107cf708f503 Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 22 Dec 2023 14:59:59 +0100 Subject: [PATCH 3/4] Update sequencer CLI arguments https://github.com/EspressoSystems/espresso-sequencer/pull/893 The second node doesn't need to run a query service, so remove it. --- system_tests/espresso-e2e/docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_tests/espresso-e2e/docker-compose.yaml b/system_tests/espresso-e2e/docker-compose.yaml index c1ecfdfb85..0a4392e19b 100644 --- a/system_tests/espresso-e2e/docker-compose.yaml +++ b/system_tests/espresso-e2e/docker-compose.yaml @@ -44,7 +44,7 @@ services: ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query-fs -- submit -- status + command: sequencer -- http -- query -- submit -- status environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL @@ -70,7 +70,7 @@ services: ports: - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) - command: sequencer -- http -- query-fs + command: sequencer -- http environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL From fbfe31e26686a75e3acc9d943cf2ef6d2527f4c0 Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 22 Dec 2023 15:59:34 +0100 Subject: [PATCH 4/4] Revert "CI: disable docker gha cache" This reverts commit bef5b0f8cf67a3ebe7b09cb6ff87f62ba85b8abf. --- .github/actions/docker-image/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-image/action.yml b/.github/actions/docker-image/action.yml index 0f2fe8ce19..f0cc8ac781 100644 --- a/.github/actions/docker-image/action.yml +++ b/.github/actions/docker-image/action.yml @@ -40,8 +40,8 @@ runs: target: ${{ inputs.target }} labels: ${{ steps.metadata.outputs.labels }} platforms: ${{ inputs.platforms }} - # cache-from: type=gha - # cache-to: type=gha,mode=max + cache-from: type=gha + cache-to: type=gha,mode=max outputs: type=image,name=${{ inputs.images }},push-by-digest=true,name-canonical=true,push=true - name: Export digest