diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e57c213..45284fd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: - setup_remote_docker - run: docker build -t bollard . # RUSTSEC-2020-0159 https://github.com/chronotope/chrono/issues/602 - - run: docker run -ti --rm bollard bash -c "cargo install --locked cargo-audit && cargo audit --deny warnings --ignore=RUSTSEC-2020-0071" + - run: docker run -ti --rm bollard bash -c "cargo install cargo-audit && cargo audit --deny warnings --ignore=RUSTSEC-2020-0071" test_fmt: docker: - image: docker:27.0 diff --git a/Cargo.toml b/Cargo.toml index 541cdc74..740ee9b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bollard" description = "An asynchronous Docker daemon API" -version = "0.16.1" +version = "0.17.0" authors = [ "Bollard contributors" ] license = "Apache-2.0" homepage = "https://github.com/fussybeaver/bollard" diff --git a/Dockerfile b/Dockerfile index 08dee52e..777613ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79.0-slim +FROM rust:1.80.0-slim WORKDIR /usr/src/bollard diff --git a/README.md b/README.md index fc3c213c..eaccda31 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,8 @@ bollard = "*" #### Latest -Version `0.16` enables more `buildkit` features, including using the Registry as a [cache -storage for intermediate container build -stages](https://docs.docker.com/build/cache/backends/registry/), syncs with [moby release -25.0.3](https://github.com/moby/moby/releases/tag/v25.0.3) and [API version 1.44.0](https://docs.docker.com/engine/api/v1.44/). +Version `0.17` enables the [`secrets`](https://docs.docker.com/build/building/secrets/#secret-mounts) and [`sshforward`](https://docs.docker.com/build/building/secrets/#ssh-mounts) components of +`buildkit`, [API version 1.45.0](https://docs.docker.com/engine/api/v1.45/). Please note: all `buildkit` API's are under *developer preview*, feedback is encouraged. diff --git a/src/container.rs b/src/container.rs index 8f4943b2..4a2b0f94 100644 --- a/src/container.rs +++ b/src/container.rs @@ -1415,7 +1415,7 @@ impl Docker { /// # Returns /// /// - [ContainerWaitResponse](ContainerWaitResponse), wrapped in a - /// Stream. + /// Stream. /// /// # Examples /// @@ -1727,7 +1727,7 @@ impl Docker { /// # Returns /// /// - [Log Output](LogOutput) enum, wrapped in a - /// Stream. + /// Stream. /// /// # Examples /// @@ -1779,7 +1779,7 @@ impl Docker { /// # Returns /// /// - An Option of Vector of [File System Change](FilesystemChange) structs, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -1819,7 +1819,7 @@ impl Docker { /// # Returns /// /// - [Stats](Stats) struct, wrapped in a - /// Stream. + /// Stream. /// /// # Examples /// @@ -2261,7 +2261,7 @@ impl Docker { } } -#[cfg(not(target_arch = "windows"))] +#[cfg(not(windows))] #[cfg(test)] mod tests { diff --git a/src/docker.rs b/src/docker.rs index 87fce172..cb86c531 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -522,7 +522,7 @@ impl Docker { /// # Defaults /// /// - The connection url is sourced from the `DOCKER_HOST` environment variable, and defaults - /// to `localhost:2375`. + /// to `localhost:2375`. /// - The number of threads used for the HTTP connection pool defaults to 1. /// - The request timeout defaults to 2 minutes. /// @@ -598,7 +598,7 @@ impl Docker { /// # Defaults /// /// - The unix socket location defaults to `/var/run/docker.sock`. The windows named pipe - /// location defaults to `//./pipe/docker_engine`. + /// location defaults to `//./pipe/docker_engine`. /// - The request timeout defaults to 2 minutes. /// /// # Examples diff --git a/src/exec.rs b/src/exec.rs index 1c43f1e2..b0ecc53a 100644 --- a/src/exec.rs +++ b/src/exec.rs @@ -118,7 +118,7 @@ impl Docker { /// # Returns /// /// - A [Create Exec Results](CreateExecResults) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// diff --git a/src/grpc/io/mod.rs b/src/grpc/io/mod.rs index 2134d443..27968804 100644 --- a/src/grpc/io/mod.rs +++ b/src/grpc/io/mod.rs @@ -6,7 +6,6 @@ use std::{ }; use hyper::rt::{Read, Write}; -use hyper_util::rt::TokioIo; use tokio::io::{AsyncRead, AsyncWrite}; use tokio_util::codec::FramedRead; use tonic::transport::server::Connected; diff --git a/src/image.rs b/src/image.rs index 9d56c5ab..47ce44ce 100644 --- a/src/image.rs +++ b/src/image.rs @@ -157,13 +157,13 @@ where { /// Filters to process on the prune list, encoded as JSON. Available filters: /// - `dangling=` When set to `true` (or `1`), prune only unused *and* untagged - /// images. When set to `false` (or `0`), all unused images are pruned. + /// images. When set to `false` (or `0`), all unused images are pruned. /// - `until=` Prune images created before this timestamp. The `` can be - /// Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) - /// computed relative to the daemon machine’s time. + /// Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) + /// computed relative to the daemon machine’s time. /// - `label` (`label=`, `label==`, `label!=`, or - /// `label!==`) Prune images with (or without, in case `label!=...` is used) the - /// specified labels. + /// `label!==`) Prune images with (or without, in case `label!=...` is used) the + /// specified labels. #[serde(serialize_with = "crate::docker::serialize_as_json")] pub filters: HashMap>, } @@ -548,7 +548,7 @@ impl Docker { /// # Returns /// /// - [Create Image Info](CreateImageInfo), wrapped in an asynchronous - /// Stream. + /// Stream. /// /// # Examples /// @@ -746,7 +746,7 @@ impl Docker { /// # Returns /// /// - Vector of [History Response Item](HistoryResponseItem), wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -782,7 +782,7 @@ impl Docker { /// # Returns /// /// - Vector of [Image Search Response Item](ImageSearchResponseItem) results, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -838,7 +838,7 @@ impl Docker { /// # Returns /// /// - Vector of [Image Delete Response Item](ImageDeleteResponseItem), wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -1077,7 +1077,7 @@ impl Docker { /// # Returns /// /// - [Create Image Info](CreateImageInfo), wrapped in an asynchronous - /// Stream. + /// Stream. /// /// # Examples /// @@ -1295,7 +1295,7 @@ impl Docker { /// # Returns /// /// - [Build Info](BuildInfo), wrapped in an asynchronous - /// Stream. + /// Stream. /// /// # Examples /// @@ -1383,7 +1383,7 @@ impl Docker { /// # Returns /// /// - [Build Info](BuildInfo), wrapped in an asynchronous - /// Stream. + /// Stream. /// /// # Examples /// @@ -1453,7 +1453,7 @@ impl Docker { } } -#[cfg(not(target_arch = "windows"))] +#[cfg(not(windows))] #[cfg(test)] mod tests { diff --git a/src/lib.rs b/src/lib.rs index 7c57192f..3754c6a4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,10 +34,8 @@ //! //! ### Latest //! -//! Version `0.16` enables more `buildkit` features, including using the Registry as a [cache -//! storage for intermediate container build -//! stages](https://docs.docker.com/build/cache/backends/registry/), syncs with [moby release -//! 25.0.3](https://github.com/moby/moby/releases/tag/v25.0.3) and [API version 1.44.0](https://docs.docker.com/engine/api/v1.44/). +//! Version `0.17` enables the [`secrets`](https://docs.docker.com/build/building/secrets/#secret-mounts) and [`sshforward`](https://docs.docker.com/build/building/secrets/#ssh-mounts) components of +//! `buildkit`, [API version 1.45.0](https://docs.docker.com/engine/api/v1.45/). //! Please note: all `buildkit` API's are under *developer preview*, feedback is //! encouraged. //! diff --git a/src/network.rs b/src/network.rs index 87f229bd..09069cfe 100644 --- a/src/network.rs +++ b/src/network.rs @@ -181,10 +181,10 @@ where { /// Filters to process on the prune list, encoded as JSON. /// - `until=` Prune networks created before this timestamp. The `` can be - /// Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) - /// computed relative to the daemon machine’s time. + /// Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) + /// computed relative to the daemon machine’s time. /// - label (`label=`, `label==`, `label!=`, or `label!==`) - /// Prune networks with (or without, in case `label!=...` is used) the specified labels. + /// Prune networks with (or without, in case `label!=...` is used) the specified labels. #[serde(serialize_with = "crate::docker::serialize_as_json")] pub filters: HashMap>, } @@ -203,7 +203,7 @@ impl Docker { /// # Returns /// /// - A [Network Create Response](NetworkCreateResponse) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -285,7 +285,7 @@ impl Docker { /// # Returns /// /// - A [Models](Network) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -335,7 +335,7 @@ impl Docker { /// # Returns /// /// - A vector of [Network](Network) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// diff --git a/src/service.rs b/src/service.rs index 0c8851a8..635870dc 100644 --- a/src/service.rs +++ b/src/service.rs @@ -190,7 +190,7 @@ impl Docker { /// # Returns /// /// - A [Service Create Response](ServiceCreateResponse) struct, - /// wrapped in a Future. + /// wrapped in a Future. /// /// # Examples /// @@ -344,7 +344,7 @@ impl Docker { /// # Returns /// /// - A [Service Update Response](ServiceUpdateResponse) struct, - /// wrapped in a Future. + /// wrapped in a Future. /// /// # Examples /// diff --git a/src/system.rs b/src/system.rs index 10155af1..ae1be3fe 100644 --- a/src/system.rs +++ b/src/system.rs @@ -256,7 +256,7 @@ impl Docker { /// # Returns /// /// - [EventMessage](crate::models::EventMessage), - /// wrapped in a Stream. + /// wrapped in a Stream. /// /// # Examples /// @@ -302,8 +302,8 @@ impl Docker { /// # Returns /// /// - [System Data Usage - /// Response](SystemDataUsageResponse), wrapped in a - /// Future. + /// Response](SystemDataUsageResponse), wrapped in a + /// Future. /// /// # Examples /// diff --git a/src/volume.rs b/src/volume.rs index 91cda374..588d4767 100644 --- a/src/volume.rs +++ b/src/volume.rs @@ -89,8 +89,8 @@ where { /// Filters to process on the prune list, encoded as JSON. /// - `label` (`label=`, `label==`, `label!=`, or - /// `label!==`) Prune volumes with (or without, in case `label!=...` is used) the - /// specified labels. + /// `label!==`) Prune volumes with (or without, in case `label!=...` is used) the + /// specified labels. #[serde(serialize_with = "crate::docker::serialize_as_json")] pub filters: HashMap>, } @@ -107,7 +107,7 @@ impl Docker { /// # Returns /// /// - A [Volume List Response]VolumeListResponse) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -160,7 +160,7 @@ impl Docker { /// # Returns /// /// - A [Volume](Volume) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples /// @@ -206,7 +206,7 @@ impl Docker { /// # Returns /// /// - A [Volume](Volume) struct, wrapped in a - /// Future. + /// Future. /// /// # Examples ///