Skip to content
Open
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
30 changes: 26 additions & 4 deletions src/GZCTF/Services/Container/Manager/DockerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,9 @@ await _client.Containers.RemoveContainerAsync(parameters.Name,
if (!_meta.ExposePort)
return container;

var portString = config.ExposedPort.ToString();
var bindings = info.NetworkSettings.Ports.Where(kv => kv.Key.StartsWith(portString)).Select(kv => kv.Value)
.SingleOrDefault();
var bindings = GetPublishedPortBindings(info.NetworkSettings.Ports, config.ExposedPort);

if (bindings is not { Count: > 0 })
if (bindings is [])
{
_logger.SystemLog(
StaticLocalizer[
Expand Down Expand Up @@ -258,6 +256,30 @@ await _client.Containers.RemoveContainerAsync(parameters.Name,
return container;
}

internal static IList<PortBinding> GetPublishedPortBindings(
IDictionary<string, IList<PortBinding>>? ports, int exposedPort)
{
if (ports is not { Count: > 0 })
return [];

var port = exposedPort.ToString();
var portPrefix = $"{port}/";
var matchedPorts = ports
.Where(kv => kv.Value is { Count: > 0 }
&& kv.Key.StartsWith(portPrefix, StringComparison.Ordinal))
.ToArray();

return matchedPorts switch
{
[] => [],
[{ Value: var bindings }] => bindings,
_ => matchedPorts.FirstOrDefault(kv =>
kv.Key.EndsWith("/tcp", StringComparison.OrdinalIgnoreCase))
.Value
?? matchedPorts[0].Value
};
}

private CreateContainerParameters GetCreateContainerParameters(GZCTF.Models.Internal.ContainerConfig config) =>
new()
{
Expand Down
Loading