Skip to content

Commit

Permalink
Merge pull request #439 from fussybeaver/ND/release-0.17.0
Browse files Browse the repository at this point in the history
Release 0.17.0
  • Loading branch information
fussybeaver committed Jul 28, 2024
2 parents 865805f + 04893e4 commit 01413b7
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.79.0-slim
FROM rust:1.80.0-slim

WORKDIR /usr/src/bollard

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
10 changes: 5 additions & 5 deletions src/container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ impl Docker {
/// # Returns
///
/// - [ContainerWaitResponse](ContainerWaitResponse), wrapped in a
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -1727,7 +1727,7 @@ impl Docker {
/// # Returns
///
/// - [Log Output](LogOutput) enum, wrapped in a
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -1779,7 +1779,7 @@ impl Docker {
/// # Returns
///
/// - An Option of Vector of [File System Change](FilesystemChange) structs, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -1819,7 +1819,7 @@ impl Docker {
/// # Returns
///
/// - [Stats](Stats) struct, wrapped in a
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -2261,7 +2261,7 @@ impl Docker {
}
}

#[cfg(not(target_arch = "windows"))]
#[cfg(not(windows))]
#[cfg(test)]
mod tests {

Expand Down
4 changes: 2 additions & 2 deletions src/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl Docker {
/// # Returns
///
/// - A [Create Exec Results](CreateExecResults) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down
1 change: 0 additions & 1 deletion src/grpc/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
26 changes: 13 additions & 13 deletions src/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ where
{
/// Filters to process on the prune list, encoded as JSON. Available filters:
/// - `dangling=<boolean>` 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=<string>` Prune images created before this timestamp. The `<timestamp>` 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=<key>`, `label=<key>=<value>`, `label!=<key>`, or
/// `label!=<key>=<value>`) Prune images with (or without, in case `label!=...` is used) the
/// specified labels.
/// `label!=<key>=<value>`) Prune images with (or without, in case `label!=...` is used) the
/// specified labels.
#[serde(serialize_with = "crate::docker::serialize_as_json")]
pub filters: HashMap<T, Vec<T>>,
}
Expand Down Expand Up @@ -548,7 +548,7 @@ impl Docker {
/// # Returns
///
/// - [Create Image Info](CreateImageInfo), wrapped in an asynchronous
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -746,7 +746,7 @@ impl Docker {
/// # Returns
///
/// - Vector of [History Response Item](HistoryResponseItem), wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -782,7 +782,7 @@ impl Docker {
/// # Returns
///
/// - Vector of [Image Search Response Item](ImageSearchResponseItem) results, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -838,7 +838,7 @@ impl Docker {
/// # Returns
///
/// - Vector of [Image Delete Response Item](ImageDeleteResponseItem), wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -1077,7 +1077,7 @@ impl Docker {
/// # Returns
///
/// - [Create Image Info](CreateImageInfo), wrapped in an asynchronous
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -1295,7 +1295,7 @@ impl Docker {
/// # Returns
///
/// - [Build Info](BuildInfo), wrapped in an asynchronous
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -1383,7 +1383,7 @@ impl Docker {
/// # Returns
///
/// - [Build Info](BuildInfo), wrapped in an asynchronous
/// Stream.
/// Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -1453,7 +1453,7 @@ impl Docker {
}
}

#[cfg(not(target_arch = "windows"))]
#[cfg(not(windows))]
#[cfg(test)]
mod tests {

Expand Down
6 changes: 2 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//!
Expand Down
12 changes: 6 additions & 6 deletions src/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ where
{
/// Filters to process on the prune list, encoded as JSON.
/// - `until=<timestamp>` Prune networks created before this timestamp. The `<timestamp>` 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=<key>`, `label=<key>=<value>`, `label!=<key>`, or `label!=<key>=<value>`)
/// 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<T, Vec<T>>,
}
Expand All @@ -203,7 +203,7 @@ impl Docker {
/// # Returns
///
/// - A [Network Create Response](NetworkCreateResponse) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -285,7 +285,7 @@ impl Docker {
/// # Returns
///
/// - A [Models](Network) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -335,7 +335,7 @@ impl Docker {
/// # Returns
///
/// - A vector of [Network](Network) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down
4 changes: 2 additions & 2 deletions src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ impl Docker {
/// # Returns
///
/// - A [Service Create Response](ServiceCreateResponse) struct,
/// wrapped in a Future.
/// wrapped in a Future.
///
/// # Examples
///
Expand Down Expand Up @@ -344,7 +344,7 @@ impl Docker {
/// # Returns
///
/// - A [Service Update Response](ServiceUpdateResponse) struct,
/// wrapped in a Future.
/// wrapped in a Future.
///
/// # Examples
///
Expand Down
6 changes: 3 additions & 3 deletions src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ impl Docker {
/// # Returns
///
/// - [EventMessage](crate::models::EventMessage),
/// wrapped in a Stream.
/// wrapped in a Stream.
///
/// # Examples
///
Expand Down Expand Up @@ -302,8 +302,8 @@ impl Docker {
/// # Returns
///
/// - [System Data Usage
/// Response](SystemDataUsageResponse), wrapped in a
/// Future.
/// Response](SystemDataUsageResponse), wrapped in a
/// Future.
///
/// # Examples
///
Expand Down
10 changes: 5 additions & 5 deletions src/volume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ where
{
/// Filters to process on the prune list, encoded as JSON.
/// - `label` (`label=<key>`, `label=<key>=<value>`, `label!=<key>`, or
/// `label!=<key>=<value>`) Prune volumes with (or without, in case `label!=...` is used) the
/// specified labels.
/// `label!=<key>=<value>`) Prune volumes with (or without, in case `label!=...` is used) the
/// specified labels.
#[serde(serialize_with = "crate::docker::serialize_as_json")]
pub filters: HashMap<T, Vec<T>>,
}
Expand All @@ -107,7 +107,7 @@ impl Docker {
/// # Returns
///
/// - A [Volume List Response]VolumeListResponse) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -160,7 +160,7 @@ impl Docker {
/// # Returns
///
/// - A [Volume](Volume) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down Expand Up @@ -206,7 +206,7 @@ impl Docker {
/// # Returns
///
/// - A [Volume](Volume) struct, wrapped in a
/// Future.
/// Future.
///
/// # Examples
///
Expand Down

0 comments on commit 01413b7

Please sign in to comment.