Merge pull request #336 from fussybeaver/ND-0.15-release

0.15 release

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bollard"
 description = "An asynchronous Docker daemon API"
-version = "0.14.0"
+version = "0.15.0"
 authors = [ "Bollard contributors" ]
 license = "Apache-2.0"
 homepage = "https://github.com/fussybeaver/bollard"
@@ -20,7 +20,7 @@ members = [
 
 [features]
 # Enable Buildkit-enabled docker image building
-buildkit = ["num", "rand", "tokio-stream", "tower", "tonic", "tower-service", "bollard-stubs/buildkit", "bollard-buildkit-proto"]
+buildkit = ["num", "rand", "tokio/fs", "tokio-stream", "tokio-util/io", "tower", "tonic", "tower-service", "bollard-stubs/buildkit", "bollard-buildkit-proto"]
 # Enable tests specifically for the http connector
 test_http = []
 # Enable tests specifically for rustls
@@ -37,8 +37,8 @@ time = ["dep:time", "bollard-stubs/time"]
 
 [dependencies]
 base64 = "0.21"
-bollard-stubs = { path = "codegen/swagger", version = "=1.43.0-rc.1", default-features = false }
-bollard-buildkit-proto = { path = "codegen/proto", version = "=0.1.0", optional = true }
+bollard-stubs = { path = "codegen/swagger", version = "=1.43.0-rc.2", default-features = false }
+bollard-buildkit-proto = { path = "codegen/proto", version = "=0.2.0", optional = true }
 bytes = "1"
 chrono = { version = "0.4", default-features = false, features = ["std", "clock", "serde"], optional = true }
 ct-logs = { version = "0.9.0", optional = true }
@@ -61,13 +61,13 @@ serde_derive = "1.0"
 serde_json = "1.0"
 serde_repr = "0.1.6"
 serde_urlencoded = "0.7"
-tokio = { version = "1.7", features = ["time", "net", "io-util"] }
+tokio = { version = "1.7", features = ["time", "net"] }
 tonic = { version = "0.10", optional = true }
 tower = { version = "0.4", optional = true }
 thiserror = "1.0"
 time = { version = "0.3", features = ["formatting", "parsing"], optional = true }
 tokio-stream = { version = "0.1", optional = true }
-tokio-util = { version = "0.7", features = ["codec", "io"] }
+tokio-util = { version = "0.7", features = ["codec"] }
 tower-service = { version = "0.3", optional = true }
 url = "2.2"
 webpki-roots = { version = "0.25.2", optional = true }
@@ -78,7 +78,6 @@ flate2 = "1.0"
 tar = "0.4"
 tokio = { version = "1.7", features = ["fs", "rt-multi-thread", "macros"] }
 yup-hyper-mock = "6.0.0"
-env_logger = "*"
 
 [target.'cfg(unix)'.dependencies]
 hyperlocal =  { version = "0.8.0" }

README.md

@@ -34,9 +34,11 @@ bollard = "*"
 
 #### Latest
 
-Version `0.14` enables a `buildkit` feature for builds using public images (check the
-[buildkit example](https://github.com/fussybeaver/bollard/blob/v0.14.0/examples/build_buildkit.rs)
-for details on how to configure).
+Version `0.15` enables more `buildkit` features, including [exporting builds to OCI
+tarballs](https://docs.docker.com/build/exporters/oci-docker/) with the
+[`image_export_oci`](https://docs.rs/bollard/latest/bollard/struct.Docker.html#method.image_export_oci)
+method. Please note: all `buildkit` API's are under *developer preview*, feedback is
+encouraged.
 
 ### Feature flags
 
@@ -51,7 +53,7 @@ for details on how to configure).
 
 ### Version
 
-The [Docker API](https://docs.docker.com/engine/api/v1.41/) used by Bollard is using the latest
+The [Docker API](https://docs.docker.com/engine/api/v1.43/) used by Bollard is using the latest
 `1.43` documentation schema published by the [moby](https://github.com/moby/moby) project to
 generate its serialization interface.
 

codegen/proto/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bollard-buildkit-proto"
 description = "Protobuf definitions to interact with buildkit using Bollard"
-version = "0.1.0"
+version = "0.2.0"
 authors = [ "Bollard contributors" ]
 license = "Apache-2.0"
 edition = "2021"

codegen/swagger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bollard-stubs"
-version = "1.43.0-rc.1"
+version = "1.43.0-rc.2"
 authors = [ "Bollard contributors" ]
 description = "Stubs used for the Bollard rust async Docker client API"
 license = "Apache-2.0"
@@ -11,7 +11,7 @@ buildkit = ["base64", "bytes", "bollard-buildkit-proto", "prost"]
 
 [dependencies]
 base64 = { version = "0.21", optional = true }
-bollard-buildkit-proto = { path = "../proto", version = "=0.1.0", optional = true }
+bollard-buildkit-proto = { path = "../proto", version = "=0.2.0", optional = true }
 bytes = { version = "1", optional = true }
 chrono = { version = "0.4", default-features = false, features = ["std", "clock", "serde"], optional = true }
 serde = { version = "1.0", features = ["derive"] }

codegen/swagger/README.md

@@ -7,9 +7,9 @@ To see how to make this your own, look here:
 
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
-- API version: 1.43.0-rc.1
-- Code generation suffix: 1.43.0-rc.1
-- Build date: 2023-06-10T11:50:15.429+01:00
+- API version: 1.43.0-rc.2
+- Code generation suffix: 1.43.0-rc.2
+- Build date: 2023-09-15T16:02:09.609+01:00
 
 This autogenerated project defines an API crate `bollard-stubs` which contains:
 * Data types representing the underlying data model.

codegen/swagger/pom.xml

@@ -27,7 +27,7 @@
                 <supportingFilesToGenerate>models.rs,lib.rs,Cargo.toml,config,README.md</supportingFilesToGenerate>
                 <configOptions>
                   <packageName>bollard-stubs</packageName>
-                  <packageVersion>1.43.0-rc.1</packageVersion>
+                  <packageVersion>1.43.0-rc.2</packageVersion>
                 </configOptions>
               </configuration>
             </execution>

codegen/swagger/src/main/resources/bollard/Cargo.mustache

@@ -10,12 +10,12 @@ edition = "2021"
 buildkit = ["base64", "bytes", "bollard-buildkit-proto", "prost"]
 
 [dependencies]
-base64 = { version = "0.13", optional = true }
-bollard-buildkit-proto = { path = "../proto", version = "=0.1.0", optional = true }
+base64 = { version = "0.21", optional = true }
+bollard-buildkit-proto = { path = "../proto", version = "=0.2.0", optional = true }
 bytes = { version = "1", optional = true }
 chrono = { version = "0.4", default-features = false, features = ["std", "clock", "serde"], optional = true }
 serde = { version = "1.0", features = ["derive"] }
-prost = { version = "0.11", optional = true }
+prost = { version = "0.12", optional = true }
 time = { version = "0.3", features = ["formatting", "parsing"], optional = true }
 
 serde_with = {version = "3.0", default-features = false, features = ["std"]}

src/docker.rs

@@ -58,7 +58,7 @@ const DEFAULT_TIMEOUT: u64 = 120;
 /// Default Client Version to communicate with the server.
 pub const API_DEFAULT_VERSION: &ClientVersion = &ClientVersion {
     major_version: 1,
-    minor_version: 42,
+    minor_version: 43,
 };
 
 /// 2 years from ct_logs 0.9 release

src/lib.rs

@@ -34,9 +34,11 @@
 //!
 //! ### Latest
 //!
-//! Version `0.14` enables a `buildkit` feature for builds using public images (check the
-//! [buildkit example](https://github.com/fussybeaver/bollard/blob/v0.14.0/examples/build_buildkit.rs)
-//! for details on how to configure).
+//! Version `0.15` enables more `buildkit` features, including [exporting builds to OCI
+//! tarballs](https://docs.docker.com/build/exporters/oci-docker/) with the
+//! [`image_export_oci`](https://docs.rs/bollard/latest/bollard/struct.Docker.html#method.image_export_oci)
+//! method. Please note: all `buildkit` API's are under *developer preview*, feedback is
+//! encouraged.
 //!
 //! ## Feature flags
 //!
@@ -51,7 +53,7 @@
 //!
 //! ## Version
 //!
-//! The [Docker API](https://docs.docker.com/engine/api/v1.41/) used by Bollard is using the latest
+//! The [Docker API](https://docs.docker.com/engine/api/v1.43/) used by Bollard is using the latest
 //! `1.43` documentation schema published by the [moby](https://github.com/moby/moby) project to
 //! generate its serialization interface.
 //!