Merge pull request #38 from Tietokilta/commit-hash

feat: add commit hash to pdf files and /health

Dockerfile

@@ -5,7 +5,7 @@ RUN apk --no-cache add musl-dev
 WORKDIR /app
 
 # Copy over the Cargo.toml files to the shell project
-COPY Cargo.toml Cargo.lock ./
+COPY Cargo.toml Cargo.lock build.rs ./
 # Build and cache the dependencies
 RUN mkdir src && echo "fn main() {}" > src/main.rs
 RUN cargo fetch
@@ -16,12 +16,14 @@ RUN rm src/main.rs
 COPY ./src ./src
 COPY ./templates ./templates
 # Update the file date so Cargo rebuilds it
+ARG GIT_COMMIT_SHA=development
+ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
 RUN touch src/main.rs
 RUN cargo build --release
 
 FROM alpine as runtime
 ENV BIND_ADDR 0.0.0.0
 WORKDIR /app
 COPY --from=builder /app/target/release/laskugeneraattori app
-EXPOSE 5237
+EXPOSE 3000
 CMD ["/app/app"]

build.rs

@@ -0,0 +1,12 @@
+use std::process::Command;
+
+fn main() {
+    let commit_hash = std::env::var("GIT_COMMIT_SHA").unwrap_or_else(|_| {
+        if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
+            String::from_utf8(output.stdout).unwrap()
+        } else {
+            String::from("dirty")
+        }
+    });
+    println!("cargo:rustc-env=COMMIT_HASH={}", commit_hash);
+}

docker-compose.yml

@@ -3,6 +3,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+      args:
+        GIT_COMMIT_SHA: development
     environment:
       - PORT=3000
       - BIND_ADDR=0.0.0.0

src/api/mod.rs

@@ -49,6 +49,10 @@ pub fn app() -> Router<crate::state::State> {
         })
 }
 
-async fn health() -> &'static str {
-    "OK"
+async fn health() -> String {
+    format!(
+        "Laskugeneraattori {} {}",
+        &env!("CARGO_PKG_VERSION"),
+        &env!("COMMIT_HASH")
+    )
 }

src/pdfgen/mod.rs

@@ -9,7 +9,7 @@ use std::{
 use typst::{
     diag::{FileError, FileResult},
     eval::Tracer,
-    foundations::{Bytes, Datetime, IntoValue},
+    foundations::{Bytes, Datetime, IntoValue, Value},
     model::Document,
     syntax::{FileId, Source, VirtualPath},
     text::{Font, FontBook},
@@ -154,8 +154,12 @@ impl Sandbox {
 
     fn with_data(&self, data: impl IntoValue) -> Self {
         let mut new = self.clone();
-        new.library
-            .update(|l| l.global.scope_mut().define("data", data));
+        new.library.update(|l| {
+            let scope = l.global.scope_mut();
+            scope.define("data", data);
+            scope.define("COMMIT_HASH", Value::Str(env!("COMMIT_HASH").into()));
+            scope.define("VERSION", Value::Str(env!("CARGO_PKG_VERSION").into()));
+        });
         new.time = time::OffsetDateTime::now_utc();
         new
     }

templates/invoice.typ

@@ -21,7 +21,11 @@
     Laskut hyväksytään Tietokillan hallituksen kokouksissa.
     Ongelmatapauksissa ota yhteyttä rahastonhoitajaan: #link("mailto:rahastonhoitaja@tietokilta.fi").
     Tarkemmat yhteystiedot löydät killan sivuilta.
+
+    #v(1em)
+    #align(right)[Laskugeneraattori #VERSION #link("https://github.com/Tietokilta/laskugeneraattori/commit/" + COMMIT_HASH)[#COMMIT_HASH.slice(0, 7)]]
   ],
+  footer-descent: -0.5em,
 )
 #set text(lang: "fi")
 
@@ -95,11 +99,11 @@
   table.header([*Tiedosto*], [*Kuvaus*]),
   ..data.attachments
     .zip(data.attachment_descriptions)
-    .map(((a, d)) => (
+    .map(((a, d)) => 
       // NOTE: add breakpoints to the string
       // so that it can be wrapped to multiple lines
-      a.filename.codepoints().map(x => x + sym.zws).join(),
-    d)).flatten()
+      (a.filename.codepoints().map(x => x + sym.zws).join(), d)
+    ).flatten()
 )
 
 #for file in data.attachments {