From 64d198725f499e475ab2644220f84cc6aa44261e Mon Sep 17 00:00:00 2001 From: Mizuki Date: Thu, 21 Mar 2024 16:05:42 +0900 Subject: [PATCH] bump --- .../docker-build-stackup-bundler.yml | 66 ------------------- genesis-deployer/Dockerfile | 4 +- genesis-init-predeploy/Dockerfile | 12 ++-- templates/docker-compose-bundler.yml | 2 +- templates/docker-compose.yml | 8 +-- 5 files changed, 15 insertions(+), 77 deletions(-) delete mode 100644 .github/workflows/docker-build-stackup-bundler.yml diff --git a/.github/workflows/docker-build-stackup-bundler.yml b/.github/workflows/docker-build-stackup-bundler.yml deleted file mode 100644 index 6ccd458..0000000 --- a/.github/workflows/docker-build-stackup-bundler.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Build stackup-bundler docker image - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository_owner }}/mothership-l2launcher-stackup-bundler - -jobs: - build: - runs-on: ubuntu-latest - - permissions: - contents: read - packages: write - id-token: write - - steps: - - name: Install cosign - if: github.event_name != 'pull_request' && github.repository_owner == 'planetarium' - uses: sigstore/cosign-installer@v3.1.1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.0.0 - - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' && github.repository_owner == 'planetarium' - uses: docker/login-action@v3.0.0 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@v5.0.0 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=raw,value=latest,enable={{is_default_branch}} - type=ref,event=branch - type=ref,event=pr - type=sha - - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@v5.0.0 - with: - context: "https://github.com/stackup-wallet/stackup-bundler.git" - platforms: linux/amd64,linux/arm64/v8 - push: ${{ github.event_name != 'pull_request' && github.repository_owner == 'planetarium' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Sign the published Docker image - if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'planetarium' }} - run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST} - env: - TAGS: ${{ steps.meta.outputs.tags }} - DIGEST: ${{ steps.build-and-push.outputs.digest }} diff --git a/genesis-deployer/Dockerfile b/genesis-deployer/Dockerfile index a774381..fc1d499 100644 --- a/genesis-deployer/Dockerfile +++ b/genesis-deployer/Dockerfile @@ -1,5 +1,5 @@ -ARG OPTIMISM_CONTRACTS_HEAD="op-node/v1.4.2" -ARG OP_NODE_VERSION="v1.4.2" +ARG OPTIMISM_CONTRACTS_HEAD="op-contracts/v1.3.0" +ARG OP_NODE_VERSION="v1.7.1" FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:${OP_NODE_VERSION} as op-node diff --git a/genesis-init-predeploy/Dockerfile b/genesis-init-predeploy/Dockerfile index 102bd1d..7ffdba0 100644 --- a/genesis-init-predeploy/Dockerfile +++ b/genesis-init-predeploy/Dockerfile @@ -1,11 +1,15 @@ -ARG OP_GETH_VERSION="v1.101305.0" +ARG OP_GETH_VERSION="v1.101308.2" FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:${OP_GETH_VERSION} as op-geth -FROM pkgxdev/pkgx as genesis-init-predeploy +FROM buildpack-deps:scm as foundry +ARG TARGETARCH +ARG FOUNDRY_URL="https://github.com/foundry-rs/foundry/releases/download/nightly/foundry_nightly_linux_${TARGETARCH}.tar.gz" +RUN curl -L ${FOUNDRY_URL} | tar -xz -C /usr/local/bin + +FROM denoland/deno:debian as genesis-init-predeploy COPY --from=op-geth /usr/local/bin/geth /usr/local/bin -RUN pkgx +deno@1.37 +getfoundry.sh@2023.7.16 \ - && pkgx install deno getfoundry.sh +COPY --from=foundry /usr/local/bin/anvil /usr/local/bin ADD predeploy.ts / RUN deno cache predeploy.ts CMD ["deno", "run", "--allow-all", "predeploy.ts"] diff --git a/templates/docker-compose-bundler.yml b/templates/docker-compose-bundler.yml index 55eda61..8aac39d 100644 --- a/templates/docker-compose-bundler.yml +++ b/templates/docker-compose-bundler.yml @@ -1,6 +1,6 @@ stackup-bundler: container_name: stackup-bundler - image: ghcr.io/planetarium/mothership-l2launcher-stackup-bundler:latest + image: stackupwallet/stackup-bundler:latest ports: - 4337:4337/tcp depends_on: diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml index f1992ea..d3c6ae0 100644 --- a/templates/docker-compose.yml +++ b/templates/docker-compose.yml @@ -27,7 +27,7 @@ services: op-geth: container_name: op-geth - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101305.0 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101308.2 volumes: - ./data/op-geth:/data - ./data/genesis:/genesis @@ -65,7 +65,7 @@ services: op-node: container_name: op-node - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.4.2 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.7.1 volumes: - ./data/op-node:/data - ./data/genesis:/genesis @@ -98,7 +98,7 @@ services: op-batcher: container_name: op-batcher - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.4.2 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.7.0 depends_on: op-node: condition: service_healthy @@ -124,7 +124,7 @@ services: op-proposer: container_name: op-proposer - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.4.2 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.7.0 volumes: - ./data/genesis:/genesis depends_on: