Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New dockerfile #77

Open
wants to merge 13 commits into
base: trunk
Choose a base branch
from
Open

New dockerfile #77

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9bdd31a
feat(docker): Rewrite Dockerfile and GitHub action.
Erk- Mar 12, 2024
98e6c79
resolve some comments
Erk- Mar 13, 2024
d0dd29a
use rustflags better
Erk- Mar 13, 2024
bf67804
add rust-src
Erk- Mar 13, 2024
144fc63
use nightly rust
Erk- Mar 13, 2024
03d2d94
small fix
Erk- Mar 13, 2024
93d22c6
update lock file
Erk- Mar 13, 2024
490a201
remove cargo-chef and link to libgcc on aarch64.
Erk- Mar 13, 2024
84551e8
clarify comment
Erk- Mar 23, 2024
26cdeed
try something
Erk- Mar 23, 2024
720d1bd
rerun
Erk- Jun 15, 2024
0428043
don't run pr commits twice
Erk- Jun 15, 2024
2dcccca
remove compiler_plugins_c
Erk- Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# Rust syntax target, either x86_64-unknown-linux-musl, aarch64-unknown-linux-musl, arm-unknown-linux-musleabi etc.
ARG RUST_TARGET="x86_64-unknown-linux-musl"
# Musl target, either x86_64-linux-musl, aarch64-linux-musl, arm-linux-musleabi, etc.
ARG MUSL_TARGET="x86_64-linux-musl"
# Rust syntax target, either x86_64-unknown-linux-musl, aarch64-unknown-linux-musl etc.
ARG RUST_TARGET="aarch64-unknown-linux-musl"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick but either here is no longer relevant i think

# The crate features to build this with
ARG FEATURES=""

FROM --platform=$BUILDPLATFORM rustlang/rust:nightly AS chef
ARG RUST_TARGET
ARG MUSL_TARGET
ARG FEATURES

RUN <<EOT
Expand All @@ -19,8 +16,8 @@ EOT

RUN <<EOT bash
set -ex
rustup target add $RUST_TARGET
rustup component add rust-src --toolchain "nightly-$RUST_TARGET"
rustup target add "$RUST_TARGET"
rustup component add rust-src --toolchain "nightly"
EOT

RUN cargo install cargo-chef --locked
Expand All @@ -47,7 +44,7 @@ rustflags = [
]

[unstable]
build-std = ["std", "panic_abort"]
build-std = ["std", "panic_abort", "compiler_builtins"]
EOF

WORKDIR /app
Expand All @@ -59,12 +56,12 @@ RUN cargo chef prepare --recipe-path recipe.json
FROM chef AS builder
COPY --from=planner /app/recipe.json recipe.json
RUN <<EOF bash
set -ex
if test "$FEATURES" = ""; then
cargo chef cook --target "$RUST_TARGET" --release --recipe-path recipe.json
else
cargo chef cook --target "$RUST_TARGET" --features="$FEATURES" --release --recipe-path recipe.json
fi
#set -ex
#if test "$FEATURES" = ""; then
# cargo chef cook --target "$RUST_TARGET" --release --recipe-path recipe.json
#else
# cargo chef cook --target "$RUST_TARGET" --features="$FEATURES" --release --recipe-path recipe.json
#fi
EOF

COPY . .
Expand Down
Loading