diff --git a/radicle-httpd/build.rs b/radicle-httpd/build.rs index 4105170c6..34d54253b 100644 --- a/radicle-httpd/build.rs +++ b/radicle-httpd/build.rs @@ -27,8 +27,8 @@ fn main() -> Result<(), Box> { "pre-release".to_owned() }; - // Set a build-time `GIT_COMMIT_TIME` env var which includes the commit time. - let commit_time = env::var("GIT_COMMIT_TIME").unwrap_or_else(|_| { + // Set a build-time `SOURCE_DATE_EPOCH` env var which includes the commit time. + let commit_time = env::var("SOURCE_DATE_EPOCH").unwrap_or_else(|_| { Command::new("git") .arg("log") .arg("-1") @@ -47,7 +47,7 @@ fn main() -> Result<(), Box> { }); println!("cargo::rustc-env=RADICLE_VERSION={version}"); - println!("cargo::rustc-env=GIT_COMMIT_TIME={commit_time}"); + println!("cargo::rustc-env=SOURCE_DATE_EPOCH={commit_time}"); println!("cargo::rustc-env=GIT_HEAD={hash}"); Ok(()) diff --git a/radicle-httpd/build/Dockerfile b/radicle-httpd/build/Dockerfile index c02b58861..a4c9c2d7f 100644 --- a/radicle-httpd/build/Dockerfile +++ b/radicle-httpd/build/Dockerfile @@ -8,6 +8,7 @@ ARG TZ ARG LC_ALL ARG SOURCE_DATE_EPOCH ARG RADICLE_VERSION +ARG GIT_HEAD # Copy cargo configuration we're going to use to specify compiler options. RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml diff --git a/radicle-httpd/build/build b/radicle-httpd/build/build index 852846634..b0ce50c40 100755 --- a/radicle-httpd/build/build +++ b/radicle-httpd/build/build @@ -53,6 +53,7 @@ main() { --build-arg TZ \ --build-arg LC_ALL \ --build-arg RADICLE_VERSION=$version \ + --build-arg GIT_HEAD=$rev \ --arch aarch64 --tag $image -f ./build/Dockerfile - <$gitarchive echo "Creating container (radicle-build-container).."