915fdc3 httpd: Dockerfile uses Rust version from rust-toolchain — radicle-explorer

rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5

Radicle web interface

httpd: Dockerfile uses Rust version from rust-toolchain

Sebastian Martinez committed 10 months ago

commit 915fdc3665d95f2c0e2e8341715626df67847ba3
parent e76f788

2 files changed +6 -1

modified radicle-httpd/build/Dockerfile

@@ -1,5 +1,7 @@

 # Builds release binaries for Radicle.
 FROM rust:1.83.0-alpine3.21 as builder
 ARG RUST_VERSION="1.87"
 ARG ALPINE_VERSION="3.20"
 FROM rust:${RUST_VERSION}-alpine${ALPINE_VERSION} as builder
 LABEL maintainer="Radicle Team <team@radicle.xyz>"
 WORKDIR /src
 COPY . .

modified radicle-httpd/build/build

@@ -34,6 +34,7 @@ main() {

   keypath="$(rad path)/keys/radicle.pub"
   version="$(build/version)"
   image=radicle-build-$version
   rust_version="$(cat ./rust-toolchain)"
   if [ ! -f "$keypath" ]; then
     echo "fatal: no key found at $keypath" >&2

@@ -51,6 +52,7 @@ main() {

   case "$OS" in
   Darwin)
     podman build \
       --build-arg "RUST_VERSION=$rust_version" \
       --build-arg SOURCE_DATE_EPOCH \
       --build-arg TZ \
       --build-arg LC_ALL \

@@ -63,6 +65,7 @@ main() {

     ;;
   *)
     podman --cgroup-manager=cgroupfs build \
       --build-arg "RUST_VERSION=$rust_version" \
       --build-arg SOURCE_DATE_EPOCH \
       --build-arg TZ \
       --build-arg LC_ALL \