Cargo.lock

@@ -300,12 +300,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "humansize"
 version = "2.1.3"
@@ -929,7 +923,6 @@ dependencies = [
  "argparse",
  "blake2",
  "file-mode",
- "hex",
  "pwd-grp",
  "serde",
  "serde_yaml",

Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 argparse = "0.2.2"
 blake2 = "0.10.6"
 file-mode = { version = "0.1.2", features = ["serde"] }
-hex = "0.4.3"
 pwd-grp = "0.1.1"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_yaml = "0.9.30"

Containerfile

@@ -1,23 +1,23 @@
-FROM docker.io/library/rust:1.73-alpine AS build
+FROM registry.fedoraproject.org/fedora-minimal:39 AS build
 
 RUN --mount=type=cache,target=/var/cache \
-    apk add \
-        musl-dev \
+    microdnf install -y \
+        --setopt install_weak_deps=0 \
+        cargo\
     && :
 
 COPY . /src
 
 WORKDIR /src
 
-RUN cargo build --release --locked \
-    && strip target/release/tmpl
+RUN cargo build --release --locked
 
 
-FROM scratch
+FROM registry.fedoraproject.org/fedora-minimal:39
 
-COPY --from=build /src/target/release/tmpl /tmpl
+COPY --from=build /src/target/release/tmpl /usr/local/bin
 
-ENTRYPOINT ["/tmpl"]
+ENTRYPOINT ["/usr/local/bin/tmpl"]
 
 LABEL name='tmpl' \
     vendor='Dustin C. Hatch' \

src/main.rs

@@ -1,7 +1,7 @@
 mod model;
 mod templating;
 
-use std::collections::BTreeSet;
+use std::collections::HashSet;
 use std::io::{Read, Seek, Write};
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -12,7 +12,7 @@ use serde::de::DeserializeOwned;
 use serde_yaml::Value;
 use shlex::Shlex;
 use tera::{Context, Tera};
-use tracing::{debug, error, info, trace, warn};
+use tracing::{debug, error, info, warn};
 
 use model::Instructions;
 
@@ -149,7 +149,7 @@ fn process_instructions(
     );
 
     let ctx = Context::from_serialize(&values)?;
-    let mut post_hooks = BTreeSet::new();
+    let mut post_hooks = HashSet::new();
     for i in instructions.render {
         let out = match tera.render(&i.template, &ctx) {
             Ok(o) => o,
@@ -161,18 +161,13 @@ fn process_instructions(
         };
         let mut dest = PathBuf::from(destdir.as_ref());
         dest.push(i.dest.strip_prefix("/").unwrap_or(i.dest.as_path()));
-        let changed = match write_file(&dest, out.as_bytes()) {
-            Ok(c) => c,
-            Err(e) => {
-                error!(
-                    "Failed to write output file {}: {}",
-                    dest.display(),
-                    e
-                );
-                continue;
-            }
-        };
-        if changed {
+        let orig_cksm = checksum(&dest).ok();
+        if let Err(e) = write_file(&dest, out.as_bytes()) {
+            error!("Failed to write output file {}: {}", dest.display(), e);
+            continue;
+        }
+        let new_cksm = checksum(&dest).ok();
+        if orig_cksm != new_cksm {
             info!("File {} was changed", dest.display());
             if let Some(hooks) = i.hooks {
                 if let Some(changed) = hooks.changed {
@@ -224,37 +219,19 @@ fn process_instructions(
 fn write_file(
     dest: impl AsRef<Path>,
     data: &[u8],
-) -> Result<bool, std::io::Error> {
+) -> Result<(), std::io::Error> {
     if let Some(p) = dest.as_ref().parent() {
         if !p.exists() {
             info!("Creating directory {}", p.display());
             std::fs::create_dir_all(p)?;
         }
     }
-    if let Ok(orig_cksm) = checksum(&dest) {
-        trace!(
-            "Original checksum: {}: {}",
-            dest.as_ref().display(),
-            hex::encode(&orig_cksm)
-        );
-        let mut blake = Blake2b512::new();
-        blake.update(data);
-        let new_cksm = blake.finalize().to_vec();
-        trace!(
-            "New checksum: {}: {}",
-            dest.as_ref().display(),
-            hex::encode(&new_cksm)
-        );
-        if orig_cksm == new_cksm {
-            return Ok(false);
-        }
-    }
     debug!("Writing output: {}", dest.as_ref().display());
     let mut f = std::fs::File::create(&dest)?;
     f.write_all(data)?;
     let size = f.stream_position()?;
     debug!("Wrote output: {} ({} bytes)", dest.as_ref().display(), size);
-    Ok(true)
+    Ok(())
 }
 
 fn chown(