Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public CommitContainerChangesParameters()
{
}

public CommitContainerChangesParameters(Config Config)
public CommitContainerChangesParameters(ContainerConfig Config)
{
if (Config != null)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Docker.DotNet.Models
{
public class Config // (container.Config)
public class ContainerConfig // (container.Config)
{
[JsonPropertyName("Hostname")]
public string Hostname { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public class ContainerExecCreateParameters // (main.ContainerExecCreateParameter
[JsonPropertyName("AttachStdout")]
public bool AttachStdout { get; set; }

[JsonPropertyName("Detach")]
public bool Detach { get; set; }

[JsonPropertyName("DetachKeys")]
public string DetachKeys { get; set; }

Expand All @@ -37,5 +34,8 @@ public class ContainerExecCreateParameters // (main.ContainerExecCreateParameter

[JsonPropertyName("Cmd")]
public IList<string> Cmd { get; set; }

[JsonPropertyName("Detach")]
public bool Detach { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public ContainerInspectResponse(ContainerJSONBase ContainerJSONBase)
public IList<MountPoint> Mounts { get; set; }

[JsonPropertyName("Config")]
public Config Config { get; set; }
public ContainerConfig Config { get; set; }

[JsonPropertyName("NetworkSettings")]
public NetworkSettings NetworkSettings { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public CreateContainerParameters()
{
}

public CreateContainerParameters(Config Config)
public CreateContainerParameters(ContainerConfig Config)
{
if (Config != null)
{
Expand Down
11 changes: 11 additions & 0 deletions src/Docker.DotNet/Models/DeviceInfo.Generated.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace Docker.DotNet.Models
{
public class DeviceInfo // (system.DeviceInfo)
{
[JsonPropertyName("Source")]
public string Source { get; set; }

[JsonPropertyName("ID")]
public string ID { get; set; }
}
}
68 changes: 68 additions & 0 deletions src/Docker.DotNet/Models/DockerOCIImageConfig.Generated.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
namespace Docker.DotNet.Models
{
public class DockerOCIImageConfig // (v1.DockerOCIImageConfig)
{
public DockerOCIImageConfig()
{
}

public DockerOCIImageConfig(ImageConfig ImageConfig, DockerOCIImageConfigExt DockerOCIImageConfigExt)
{
if (ImageConfig != null)
{
this.User = ImageConfig.User;
this.ExposedPorts = ImageConfig.ExposedPorts;
this.Env = ImageConfig.Env;
this.Entrypoint = ImageConfig.Entrypoint;
this.Cmd = ImageConfig.Cmd;
this.Volumes = ImageConfig.Volumes;
this.WorkingDir = ImageConfig.WorkingDir;
this.Labels = ImageConfig.Labels;
this.StopSignal = ImageConfig.StopSignal;
}

if (DockerOCIImageConfigExt != null)
{
this.Healthcheck = DockerOCIImageConfigExt.Healthcheck;
this.OnBuild = DockerOCIImageConfigExt.OnBuild;
this.Shell = DockerOCIImageConfigExt.Shell;
}
}

[JsonPropertyName("User")]
public string User { get; set; }

[JsonPropertyName("ExposedPorts")]
public IDictionary<string, EmptyStruct> ExposedPorts { get; set; }

[JsonPropertyName("Env")]
public IList<string> Env { get; set; }

[JsonPropertyName("Entrypoint")]
public IList<string> Entrypoint { get; set; }

[JsonPropertyName("Cmd")]
public IList<string> Cmd { get; set; }

[JsonPropertyName("Volumes")]
public IDictionary<string, EmptyStruct> Volumes { get; set; }

[JsonPropertyName("WorkingDir")]
public string WorkingDir { get; set; }

[JsonPropertyName("Labels")]
public IDictionary<string, string> Labels { get; set; }

[JsonPropertyName("StopSignal")]
public string StopSignal { get; set; }

[JsonPropertyName("Healthcheck")]
public HealthcheckConfig Healthcheck { get; set; }

[JsonPropertyName("OnBuild")]
public IList<string> OnBuild { get; set; }

[JsonPropertyName("Shell")]
public IList<string> Shell { get; set; }
}
}
14 changes: 14 additions & 0 deletions src/Docker.DotNet/Models/DockerOCIImageConfigExt.Generated.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Docker.DotNet.Models
{
public class DockerOCIImageConfigExt // (v1.DockerOCIImageConfigExt)
{
[JsonPropertyName("Healthcheck")]
public HealthcheckConfig Healthcheck { get; set; }

[JsonPropertyName("OnBuild")]
public IList<string> OnBuild { get; set; }

[JsonPropertyName("Shell")]
public IList<string> Shell { get; set; }
}
}
2 changes: 1 addition & 1 deletion src/Docker.DotNet/Models/ImageBuildResponse.Generated.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Docker.DotNet.Models
{
public class ImageBuildResponse // (types.ImageBuildResponse)
public class ImageBuildResponse // (build.ImageBuildResponse)
{
[JsonPropertyName("Body")]
public object Body { get; set; }
Expand Down
32 changes: 32 additions & 0 deletions src/Docker.DotNet/Models/ImageConfig.Generated.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
namespace Docker.DotNet.Models
{
public class ImageConfig // (v1.ImageConfig)
{
[JsonPropertyName("User")]
public string User { get; set; }

[JsonPropertyName("ExposedPorts")]
public IDictionary<string, EmptyStruct> ExposedPorts { get; set; }

[JsonPropertyName("Env")]
public IList<string> Env { get; set; }

[JsonPropertyName("Entrypoint")]
public IList<string> Entrypoint { get; set; }

[JsonPropertyName("Cmd")]
public IList<string> Cmd { get; set; }

[JsonPropertyName("Volumes")]
public IDictionary<string, EmptyStruct> Volumes { get; set; }

[JsonPropertyName("WorkingDir")]
public string WorkingDir { get; set; }

[JsonPropertyName("Labels")]
public IDictionary<string, string> Labels { get; set; }

[JsonPropertyName("StopSignal")]
public string StopSignal { get; set; }
}
}
4 changes: 2 additions & 2 deletions src/Docker.DotNet/Models/ImageInspectResponse.Generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ImageInspectResponse // (image.InspectResponse)
public string Container { get; set; }

[JsonPropertyName("ContainerConfig")]
public Config ContainerConfig { get; set; }
public ContainerConfig ContainerConfig { get; set; }

[JsonPropertyName("DockerVersion")]
public string DockerVersion { get; set; }
Expand All @@ -33,7 +33,7 @@ public class ImageInspectResponse // (image.InspectResponse)
public string Author { get; set; }

[JsonPropertyName("Config")]
public Config Config { get; set; }
public DockerOCIImageConfig Config { get; set; }

[JsonPropertyName("Architecture")]
public string Architecture { get; set; }
Expand Down
1 change: 0 additions & 1 deletion src/Docker.DotNet/Models/RestartPolicyKind.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

namespace Docker.DotNet.Models;

public enum RestartPolicyKind
Expand Down
9 changes: 3 additions & 6 deletions src/Docker.DotNet/Models/SystemInfoResponse.Generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ public class SystemInfoResponse // (system.Info)
[JsonPropertyName("IPv4Forwarding")]
public bool IPv4Forwarding { get; set; }

[JsonPropertyName("BridgeNfIptables")]
public bool BridgeNfIptables { get; set; }

[JsonPropertyName("BridgeNfIp6tables")]
public bool BridgeNfIP6tables { get; set; }

[JsonPropertyName("Debug")]
public bool Debug { get; set; }

Expand Down Expand Up @@ -191,6 +185,9 @@ public class SystemInfoResponse // (system.Info)
[JsonPropertyName("CDISpecDirs")]
public IList<string> CDISpecDirs { get; set; }

[JsonPropertyName("DiscoveredDevices")]
public IList<DeviceInfo> DiscoveredDevices { get; set; }

[JsonPropertyName("Containerd")]
public ContainerdInfo Containerd { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion tools/specgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/docker v28.1.1+incompatible
github.com/docker/docker v28.3.3+incompatible
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions tools/specgen/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
Expand Down
Loading
Loading