Cargo.toml

@@ -1,30 +1,27 @@
 [package]
-authors = [
-    "Dustin Martin <dustin@dmartin.io>",
-    "picoCTF Team <opensource@picoctf.org>",
-]
+authors = ["picoCTF Team <opensource@picoctf.org>"]
 description = "Command line tool for removing expired Docker resources"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 name = "docker-reaper"
 repository = "https://github.com/picoCTF/docker-reaper"
-version = "1.0.0"
+version = "1.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.95"
+anyhow = "1.0.98"
 bollard = { version = "0.18.1", features = ["ssl"] }
-chrono = { version = "0.4.39", default-features = false, features = [
+chrono = { version = "0.4.41", default-features = false, features = [
     "std",
     "clock",
 ] }
-clap = { version = "4.5.23", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }
 futures = "0.3.31"
 go-parse-duration = "0.1.1"
-tabled = "0.17.0"
-thiserror = "2.0.9"
-tokio = { version = "1.42.0", features = ["full"] }
+tabled = "0.19.0"
+thiserror = "2.0.12"
+tokio = { version = "1.44.2", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 

RELEASING.md

@@ -0,0 +1,12 @@
+# Releasing
+
+1. Ensure that [`CHANGELOG.md`](./CHANGELOG.md) is up-to-date with all relevant changes. Additionally, make sure that the version specified in [Cargo.toml](./Cargo.toml) matches the to-be-released version.
+
+1. Create and push a new Git tag for the version with a `v` prefix, e.g.:
+    ```shell
+    git tag vX.Y.Z
+    git push --tags
+    ```
+    This will automatically run the "Publish release" GitHub Actions workflow, which will create a GitHub release, build a release tarball, and attach the tarball to the release.
+
+1. Edit the newly created GitHub release, setting the relevant section of `CHANGELOG.md` as the description.

src/lib.rs

@@ -1,9 +1,9 @@
+#[doc(no_inline)]
+pub use bollard::Docker;
 use bollard::container::{ListContainersOptions, RemoveContainerOptions};
 use bollard::network::ListNetworksOptions;
 use bollard::service::VolumeListResponse;
 use bollard::volume::ListVolumesOptions;
-#[doc(no_inline)]
-pub use bollard::Docker;
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -111,7 +111,6 @@ impl Filter {
 pub enum ResourceType {
     Container,
     Network,
-    #[allow(dead_code)]
     Volume,
 }
 
@@ -137,7 +136,6 @@ pub struct Resource {
     #[tabled(rename = "Resource Type")]
     pub resource_type: ResourceType,
     #[tabled(skip)]
-    #[allow(dead_code)]
     pub id: String,
     pub name: String,
     pub status: RemovalStatus,

src/main.rs

@@ -4,10 +4,10 @@ use tracing::{debug, error, info, warn};
 use anyhow::Context;
 use clap::{Args, Parser, Subcommand};
 use docker_reaper::{
-    reap_containers, reap_networks, reap_volumes, Docker, Filter, ReapContainersConfig,
-    ReapNetworksConfig, ReapVolumesConfig,
+    Docker, Filter, ReapContainersConfig, ReapNetworksConfig, ReapVolumesConfig, reap_containers,
+    reap_networks, reap_volumes,
 };
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 
 #[derive(Debug, Parser)]
 #[command(
@@ -131,7 +131,9 @@ async fn main() -> Result<(), anyhow::Error> {
             debug!("Environment variable DOCKER_CERT_PATH set. Connecting via TLS");
             Docker::connect_with_ssl_defaults()?
         } else if env::var("DOCKER_HOST").is_ok() {
-            debug!("Environment variable DOCKER_HOST set, but not DOCKER_CERT_PATH. Connecting via HTTP");
+            debug!(
+                "Environment variable DOCKER_HOST set, but not DOCKER_CERT_PATH. Connecting via HTTP"
+            );
             Docker::connect_with_http_defaults()?
         } else {
             debug!("Environment variable DOCKER_HOST not set, connecting to local machine");
@@ -185,8 +187,8 @@ async fn main() -> Result<(), anyhow::Error> {
                 info!("Found {} matching resources", removed_resources.len());
                 if !removed_resources.is_empty() {
                     use tabled::{
-                        settings::{object::Columns, Style, Width},
                         Table,
+                        settings::{Style, Width, object::Columns},
                     };
                     let mut table = Table::new(removed_resources);
                     info!(

tests/common.rs

@@ -1,16 +1,16 @@
 //! Common utility functions for integration tests.
 #![allow(dead_code)]
 
+use bollard::Docker;
 use bollard::container::{Config, NetworkingConfig};
 use bollard::image::CreateImageOptions;
 use bollard::network::CreateNetworkOptions;
 use bollard::secret::{ContainerCreateResponse, EndpointSettings};
 use bollard::volume::CreateVolumeOptions;
-use bollard::Docker;
 use chrono::Utc;
 use docker_reaper::{
-    reap_containers, reap_networks, reap_volumes, Filter, ReapContainersConfig, ReapNetworksConfig,
-    ReapVolumesConfig,
+    Filter, ReapContainersConfig, ReapNetworksConfig, ReapVolumesConfig, reap_containers,
+    reap_networks, reap_volumes,
 };
 use std::collections::HashMap;
 use std::sync::OnceLock;

tests/containers.rs

@@ -7,14 +7,14 @@ mod common;
 use std::collections::HashMap;
 
 use common::{
-    cleanup, container_exists, docker_client, network_exists, run_container, RunContainerResult,
-    TEST_LABEL,
+    RunContainerResult, TEST_LABEL, cleanup, container_exists, docker_client, network_exists,
+    run_container,
 };
 use docker_reaper::{
-    reap_containers, Filter, ReapContainersConfig, RemovalStatus, Resource, ResourceType,
+    Filter, ReapContainersConfig, RemovalStatus, Resource, ResourceType, reap_containers,
 };
 use serial_test::serial;
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 
 /// Test that only containers older than the `min_age` threshold are reaped.
 #[tokio::test]

tests/networks.rs

@@ -6,12 +6,12 @@ mod common;
 
 use std::collections::HashMap;
 
-use common::{cleanup, create_network, docker_client, network_exists, TEST_LABEL};
+use common::{TEST_LABEL, cleanup, create_network, docker_client, network_exists};
 use docker_reaper::{
-    reap_networks, Filter, ReapNetworksConfig, RemovalStatus, Resource, ResourceType,
+    Filter, ReapNetworksConfig, RemovalStatus, Resource, ResourceType, reap_networks,
 };
 use serial_test::serial;
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 
 /// Test that only networks older than the `min_age` threshold are reaped.
 #[tokio::test]

tests/volumes.rs

@@ -6,12 +6,12 @@ mod common;
 
 use std::collections::HashMap;
 
-use common::{cleanup, create_volume, docker_client, volume_exists, TEST_LABEL};
+use common::{TEST_LABEL, cleanup, create_volume, docker_client, volume_exists};
 use docker_reaper::{
-    reap_volumes, Filter, ReapVolumesConfig, RemovalStatus, Resource, ResourceType,
+    Filter, ReapVolumesConfig, RemovalStatus, Resource, ResourceType, reap_volumes,
 };
 use serial_test::serial;
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 
 /// Test that only volumes older than the `min_age` threshold are reaped.
 #[tokio::test]