CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.23.0] - 2023-08-17
+
+### Changed
+- Docuum now only runs its vacuuming logic when it learns about a new image for the first time.
+
 ## [0.22.4] - 2023-06-18
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "docuum"
-version = "0.22.4"
+version = "0.23.0"
 authors = ["Stephan Boyer <stephan@stephanboyer.com>"]
 edition = "2021"
 description = "LRU eviction of Docker images."

install.sh

@@ -14,7 +14,7 @@
   DESTINATION="${PREFIX:-/usr/local/bin}/docuum"
 
   # Which version to download
-  RELEASE="v${VERSION:-0.22.3}"
+  RELEASE="v${VERSION:-0.22.4}"
 
   # Determine which binary to download.
   FILENAME=''

src/run.rs

@@ -158,7 +158,7 @@ fn parent_id(state: &State, image_id: &str) -> io::Result<Option<String>> {
 }
 
 // Query Docker for all the images.
-fn list_image_records(state: &mut State) -> io::Result<HashMap<String, ImageRecord>> {
+fn list_image_records(state: &State) -> io::Result<HashMap<String, ImageRecord>> {
     // Get the IDs and creation timestamps of all the images.
     let output = Command::new("docker")
         .args([
@@ -432,7 +432,8 @@ fn delete_image(image: &str) -> io::Result<()> {
 }
 
 // Update the timestamp for an image.
-fn touch_image(state: &mut State, image_id: &str, verbose: bool) -> io::Result<()> {
+// Returns a boolean indicating if a new entry was created for the image.
+fn touch_image(state: &mut State, image_id: &str, verbose: bool) -> io::Result<bool> {
     if verbose {
         debug!(
             "Updating last-used timestamp for image {}\u{2026}",
@@ -449,14 +450,16 @@ fn touch_image(state: &mut State, image_id: &str, verbose: bool) -> io::Result<(
     match SystemTime::now().duration_since(UNIX_EPOCH) {
         Ok(duration) => {
             // Store the image metadata in the state.
-            state.images.insert(
-                image_id.to_owned(),
-                state::Image {
-                    parent_id: parent_id(state, image_id)?,
-                    last_used_since_epoch: duration,
-                },
-            );
-            Ok(())
+            Ok(state
+                .images
+                .insert(
+                    image_id.to_owned(),
+                    state::Image {
+                        parent_id: parent_id(state, image_id)?,
+                        last_used_since_epoch: duration,
+                    },
+                )
+                .is_none())
         }
         Err(error) => Err(io::Error::new(
             io::ErrorKind::Other,
@@ -830,16 +833,16 @@ pub fn run(settings: &Settings, state: &mut State, first_run: &mut bool) -> io::
         debug!("Waking up\u{2026}");
 
         // Update the timestamp for this image.
-        touch_image(state, &image_id, true)?;
-
-        // Run the main vacuum logic.
-        vacuum(
-            state,
-            *first_run,
-            threshold,
-            &settings.keep,
-            settings.deletion_chunk_size,
-        )?;
+        if touch_image(state, &image_id, true)? {
+            // Run the main vacuum logic only if a new image came in.
+            vacuum(
+                state,
+                *first_run,
+                threshold,
+                &settings.keep,
+                settings.deletion_chunk_size,
+            )?;
+        }
 
         // Persist the state.
         state::save(state)?;

toast.yml

@@ -260,7 +260,7 @@ tasks:
     dependencies:
       - release
     input_paths:
-      - integration_test.sh
+      - integration-test.sh
     cache: false
     mount_paths:
       - /var/run/docker.sock
@@ -283,8 +283,8 @@ tasks:
         docker:dind
       docker exec dind apk add bash
       docker cp "artifacts/docuum-x86_64-unknown-linux-musl" dind:/
-      docker cp integration_test.sh dind:/
-      docker exec dind ./integration_test.sh
+      docker cp integration-test.sh dind:/
+      docker exec dind ./integration-test.sh
 
   publish:
     description: Publish the crate to crates.io.