diff --git a/Dockerfile b/Dockerfile index eb65634..24570aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG RUST_VERSION -FROM docker.io/clux/muslrust:${RUST_VERSION} +FROM docker.io/clux/muslrust:${RUST_VERSION}-stable SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update && \ apt-get install -y --no-install-recommends \ @@ -12,6 +12,7 @@ ARG MOLD_VERSION RUN wget -qO- https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-x86_64-linux.tar.gz | tar xzf - \ && cp -RT mold-${MOLD_VERSION}-x86_64-linux /usr/local \ && rm -rf mold-${MOLD_VERSION}-x86_64-linux -RUN cargo install cargo-chef --version 0.1.65 --locked +ARG CARGO_CHEF_VERSION +RUN cargo install cargo-chef --version ${CARGO_CHEF_VERSION} --locked WORKDIR /env RUN echo "export MOLD=$(which mold)" > .env diff --git a/Makefile b/Makefile index 7ae71f9..1f14a70 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ .PHONY: build -RUST_VERSION = 1.76.0 -MOLD_VERSION = 2.4.1 +RUST_VERSION = 1.82.0 +MOLD_VERSION = 2.34.1 +CARGO_CHEF_VERSION = 0.1.68 build: docker build . \ -t git.dergrimm.net/dergrimm/muslrust:$(RUST_VERSION) \ --build-arg="RUST_VERSION=$(RUST_VERSION)" \ - --build-arg="MOLD_VERSION=$(MOLD_VERSION)" + --build-arg="MOLD_VERSION=$(MOLD_VERSION)" \ + --build-arg="CARGO_CHEF_VERSION=$(CARGO_CHEF_VERSION)"