Skip to content

Commit

Permalink
feat(release): remove need of Dockerfile.build
Browse files Browse the repository at this point in the history
  • Loading branch information
0xfourzerofour committed Feb 23, 2024
1 parent f066a8f commit 9647536
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[build]
dockerfile = "Dockerfile.build"
pre-build = [
"apt-get update && apt-get install --assume-yes --no-install-recommends llvm-dev libclang-6.0-dev clang-6.0 pkg-config libssl-dev"
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH"
]

8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
# Adapted from https://github.com/paradigmxyz/reth/blob/main/Dockerfile
# syntax=docker/dockerfile:1.4

FROM ghcr.io/foundry-rs/foundry:latest as foundry

FROM --platform=$TARGETPLATFORM rust:1.75.0 AS chef-builder

# Install system dependencies
COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
RUN apt-get update && apt-get install -y pkg-config libssl-dev libclang-dev
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
RUN mkdir -p /etc/apt/keyrings
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
RUN apt-get update && apt-get -y upgrade && apt-get install -y protobuf-compiler nodejs yarn rsync

SHELL ["/bin/bash", "-c"]
RUN curl -L https://foundry.paradigm.xyz | bash
ENV PATH="/root/.foundry/bin:${PATH}"
RUN foundryup

RUN cargo install cargo-chef --locked

WORKDIR /app
Expand Down

0 comments on commit 9647536

Please sign in to comment.