Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Peg to API 1.45 moby release v26.0.1 #437

Merged
merged 3 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ yup-hyper-mock = { version = "8.0.0" }
once_cell = "1.19"

[target.'cfg(unix)'.dependencies]
hyperlocal-next = { version = "0.9.0" }
hyperlocal = { version = "0.9.0" }

[target.'cfg(unix)'.dev-dependencies]
termion = "4.0"
Expand Down
2 changes: 1 addition & 1 deletion codegen/swagger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bollard-stubs"
version = "1.44.0-rc.26.0.1"
version = "1.45.0-rc.26.0.1"
authors = [ "Bollard contributors" ]
description = "Stubs used for the Bollard rust async Docker client API"
license = "Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions codegen/swagger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.44.0-rc.26.0.1
- Code generation suffix: 1.44.0-rc.26.0.1
- Build date: 2024-07-20T13:29:06.658+01:00
- API version: 1.45.0-rc.26.0.1
- Code generation suffix: 1.45.0-rc.26.0.1
- Build date: 2024-07-21T19:49:38.171+01:00

This autogenerated project defines an API crate `bollard-stubs` which contains:
* Data types representing the underlying data model.
Expand Down
4 changes: 2 additions & 2 deletions codegen/swagger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>https://raw.githubusercontent.com/moby/moby/v26.0.0/docs/api/v1.44.yaml</inputSpec>
<inputSpec>https://raw.githubusercontent.com/moby/moby/v26.0.1/docs/api/v1.45.yaml</inputSpec>
<language>bollard.BollardCodegen</language>
<output>${project.basedir}</output>
<generateApis>true</generateApis>
<templateDirectory>${project.basedir}/src/main/resources/bollard</templateDirectory>
<supportingFilesToGenerate>models.rs,lib.rs,Cargo.toml,config,README.md</supportingFilesToGenerate>
<configOptions>
<packageName>bollard-stubs</packageName>
<packageVersion>1.44.0-rc.26.0.1</packageVersion>
<packageVersion>1.45.0-rc.26.0.1</packageVersion>
</configOptions>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion codegen/swagger/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::io::Error;
#[allow(unused_imports)]
use std::collections::HashMap;

pub const BASE_PATH: &str = "/v1.44";
pub const BASE_PATH: &str = "/v1.45";

pub mod models;

Expand Down
9 changes: 7 additions & 2 deletions codegen/swagger/src/models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3047,7 +3047,7 @@ pub struct ImageSearchResponseItem {
#[serde(skip_serializing_if = "Option::is_none")]
pub is_official: Option<bool>,

/// Whether this repository has automated builds enabled. <p><br /></p> > **Deprecated**: This field is deprecated and will always > be \"false\" in future.
/// Whether this repository has automated builds enabled. <p><br /></p> > **Deprecated**: This field is deprecated and will always be \"false\".
#[serde(rename = "is_automated")]
#[serde(skip_serializing_if = "Option::is_none")]
pub is_automated: Option<bool>,
Expand Down Expand Up @@ -3399,7 +3399,7 @@ pub struct MountBindOptions {
#[serde(skip_serializing_if = "Option::is_none")]
pub create_mountpoint: Option<bool>,

/// Make the mount non-recursively read-only, but still leave the mount recursive (unless NonRecursive is set to true in conjunction).
/// Make the mount non-recursively read-only, but still leave the mount recursive (unless NonRecursive is set to `true` in conjunction). Addded in v1.44, before that version all read-only mounts were non-recursive by default. To match the previous behaviour this will default to `true` for clients on versions prior to v1.44.
#[serde(rename = "ReadOnlyNonRecursive")]
#[serde(skip_serializing_if = "Option::is_none")]
pub read_only_non_recursive: Option<bool>,
Expand Down Expand Up @@ -3611,6 +3611,11 @@ pub struct MountVolumeOptions {
#[serde(skip_serializing_if = "Option::is_none")]
pub driver_config: Option<MountVolumeOptionsDriverConfig>,

/// Source path inside the volume. Must be relative without any back traversals.
#[serde(rename = "Subpath")]
#[serde(skip_serializing_if = "Option::is_none")]
pub subpath: Option<String>,

}

/// Map of driver specific options
Expand Down
4 changes: 2 additions & 2 deletions src/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use hyper_rustls::HttpsConnector;
use hyper_util::client::legacy::connect::HttpConnector;
use hyper_util::{client::legacy::Client, rt::TokioExecutor};
#[cfg(unix)]
use hyperlocal_next::UnixConnector;
use hyperlocal::UnixConnector;
use log::{debug, trace};
#[cfg(feature = "ssl")]
use rustls::{crypto::ring::sign::any_supported_type, sign::CertifiedKey, ALL_VERSIONS};
Expand Down Expand Up @@ -78,7 +78,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: 44,
minor_version: 45,
};

#[derive(Debug, Clone)]
Expand Down