diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml index b17d040bd..23167c5bb 100644 --- a/.github/workflows/docker-release.yaml +++ b/.github/workflows/docker-release.yaml @@ -47,4 +47,4 @@ jobs: - name: Build and push image run: | cargo install cross - env PROFILE=maxperf make docker-build-latest + env PROFILE=release make docker-build-latest diff --git a/Cargo.toml b/Cargo.toml index 797536a51..0c7159b31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,3 @@ tracing = "0.1.37" strum = "0.25.0" url = "2.3.1" -[profile.maxperf] -inherits = "release" -lto = "fat" -codegen-units = 1 -incremental = false diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index c4ed133fe..000000000 --- a/Cross.toml +++ /dev/null @@ -1,6 +0,0 @@ -[build] -pre-build = [ - "curl -L https://foundry.paradigm.xyz | bash", - 'export PATH="/root/.foundry/bin:${PATH}"', - "foundryup" -] \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 82cd6b804..d02b40be2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Adapted from https://github.com/paradigmxyz/reth/blob/main/Dockerfile # syntax=docker/dockerfile:1.4 -FROM rust:1.72.0 AS chef-builder +FROM --platform=$TARGETPLATFORM rust:1.72.0 AS chef-builder # Install system dependencies RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list diff --git a/Dockerfile.cross b/Dockerfile.cross deleted file mode 100644 index bf8a3aa14..000000000 --- a/Dockerfile.cross +++ /dev/null @@ -1,16 +0,0 @@ - -# This image is meant to enable cross-architecture builds. -# It assumes the rundler binary has already been compiled for `$TARGETPLATFORM` and is -# locatable in `./dist/bin/$TARGETARCH` -FROM --platform=$TARGETPLATFORM rust:1.72.0 - -LABEL org.opencontainers.image.source=https://github.com/alchemyplatform/rundler -LABEL org.opencontainers.image.licenses="GNU General Public License v3.0" - -# Filled by docker buildx -ARG TARGETARCH - -COPY ./dist/bin/$TARGETARCH/rundler /usr/local/bin/rundler - -EXPOSE 3000 8080 -ENTRYPOINT ["/usr/local/bin/rundler"] diff --git a/Makefile b/Makefile index 31bc3c36c..f88b20971 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ define build_docker_image mkdir -p $(BIN_DIR)/arm64 cp $(BUILD_PATH)/aarch64-unknown-linux-gnu/$(PROFILE)/rundler $(BIN_DIR)/arm64/rundler - docker buildx build --file ./Dockerfile.cross . \ + docker buildx build . \ --platform linux/amd64,linux/arm64 \ --tag $(DOCKER_IMAGE_NAME):$(1) \ --tag $(DOCKER_IMAGE_NAME):$(2) \