Skip to content

Commit 446dcea

Browse files
authored
feat: Update to Docker Engine v29 (#49)
1 parent 5f66cf8 commit 446dcea

File tree

100 files changed

+637
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+637
-787
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ To obtain this stream you can use:
163163
```csharp
164164
Stream stream = await client.System.MonitorEventsAsync(
165165
new ContainerEventsParameters(),
166-
new Progress<JSONMessage>(),
166+
new Progress<Message>(),
167167
CancellationToken.None);
168168
```
169169

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespace Docker.DotNet;
2+
3+
internal class Base64Converter : JsonConverter<IList<byte>>
4+
{
5+
public override IList<byte> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
6+
{
7+
var base64String = reader.GetString();
8+
return base64String == null ? null : Convert.FromBase64String(base64String);
9+
}
10+
11+
public override void Write(Utf8JsonWriter writer, IList<byte> value, JsonSerializerOptions options)
12+
{
13+
var base64String = Convert.ToBase64String(value.ToArray());
14+
writer.WriteStringValue(base64String);
15+
}
16+
}

src/Docker.DotNet/Endpoints/ExecOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public async Task<MultiplexedStream> StartContainerExecAsync(string id, Containe
5858
var stream = await _client.MakeRequestForHijackedStreamAsync([NoSuchContainerHandler], HttpMethod.Post, $"exec/{id}/start", null, data, null, cancellationToken)
5959
.ConfigureAwait(false);
6060

61-
return new MultiplexedStream(stream, !parameters.Tty);
61+
return new MultiplexedStream(stream, !parameters.TTY);
6262
}
6363
}

src/Docker.DotNet/Endpoints/IPluginOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public interface IPluginOperations
2828
/// 200 - No error.
2929
/// 500 - Server error.
3030
/// </remarks>
31-
Task<IList<PluginPrivilege>> GetPluginPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
31+
Task<IList<PluginPrivilege>> GetPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
3232

3333
/// <summary>
3434
/// Install a plugin.

src/Docker.DotNet/Endpoints/ISecretsOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ISecretsOperations
2020
/// 409 - Name conflicts with an existing object.
2121
/// 500 - Server error.
2222
/// </remarks>
23-
Task<SecretCreateResponse> CreateAsync(SecretSpec body, CancellationToken cancellationToken = default(CancellationToken));
23+
Task<SecretCreateResponse> CreateAsync(SwarmSecretSpec body, CancellationToken cancellationToken = default(CancellationToken));
2424

2525
/// <summary>
2626
/// Inspect a secret

src/Docker.DotNet/Endpoints/PluginOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal PluginOperations(DockerClient client)
2424
return await _client.MakeRequestAsync<Plugin[]>(_client.NoErrorHandlers, HttpMethod.Get, "plugins", queryParameters, cancellationToken).ConfigureAwait(false);
2525
}
2626

27-
public async Task<IList<PluginPrivilege>> GetPluginPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken))
27+
public async Task<IList<PluginPrivilege>> GetPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken))
2828
{
2929
if (parameters == null)
3030
{

src/Docker.DotNet/Endpoints/SecretsOperations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ async Task<IList<Secret>> ISecretsOperations.ListAsync(CancellationToken cancell
1414
return await _client.MakeRequestAsync<IList<Secret>>(_client.NoErrorHandlers, HttpMethod.Get, "secrets", cancellationToken).ConfigureAwait(false);
1515
}
1616

17-
async Task<SecretCreateResponse> ISecretsOperations.CreateAsync(SecretSpec body, CancellationToken cancellationToken)
17+
async Task<SecretCreateResponse> ISecretsOperations.CreateAsync(SwarmSecretSpec body, CancellationToken cancellationToken)
1818
{
1919
if (body == null)
2020
{
2121
throw new ArgumentNullException(nameof(body));
2222
}
2323

24-
var data = new JsonRequestContent<SecretSpec>(body, DockerClient.JsonSerializer);
24+
var data = new JsonRequestContent<SwarmSecretSpec>(body, DockerClient.JsonSerializer);
2525
return await _client.MakeRequestAsync<SecretCreateResponse>(_client.NoErrorHandlers, HttpMethod.Post, "secrets/create", null, data, cancellationToken).ConfigureAwait(false);
2626
}
2727

src/Docker.DotNet/JsonBase64Converter.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/Docker.DotNet/JsonSerializer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ private JsonSerializer()
1515
_options.Converters.Add(new JsonEnumMemberConverter<TaskState>());
1616
_options.Converters.Add(new JsonDateTimeConverter());
1717
_options.Converters.Add(new JsonNullableDateTimeConverter());
18-
_options.Converters.Add(new JsonBase64Converter());
1918
}
2019

2120
public static JsonSerializer Instance { get; }

src/Docker.DotNet/Models/Address.Generated.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)