mirror of
https://github.com/apple/container.git
synced 2026-09-19 22:25:44 +00:00
J Logan
d29947121f
- Adds a a `--log-root` option to `swift system start`, propagating the value as `CONTAINER_LOG_ROOT` to services for logging to files instead of the OS log facility. This is not a "production" capability as it neither merges nor rotates logs. - Currently we don't collect logs on CI builds, and we don't have permission to run the `log` command there. The PR adds `--log-root` to the CI test phase, archives the results, and uploads the archive as an artifact. - Use FilePath from swift-system for the log root. Foundation URL is a bit of a footgun for filesystem paths, so unless we identify a showstopper, we should incrementally transition to this type everywhere except where we really need network URLs. - Output the hostname of the CI runner at the start of the test phase so we can identify runner-specific issues where they exist. - Fix formatting for log messages with multiple metadata items, and fix unstructured messages on instances that weren't found using `grep -r 'log\.' Sources`. - Adds command reference documentation for `--log-root`.
73 lines
2.7 KiB
Swift
73 lines
2.7 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ArgumentParser
|
|
import ContainerAPIClient
|
|
import Foundation
|
|
|
|
extension Application.NetworkCommand {
|
|
public struct NetworkPrune: AsyncLoggableCommand {
|
|
public init() {}
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "prune",
|
|
abstract: "Remove networks with no container connections"
|
|
)
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
public func run() async throws {
|
|
let client = ContainerClient()
|
|
let allContainers = try await client.list()
|
|
let allNetworks = try await ClientNetwork.list()
|
|
|
|
var networksInUse = Set<String>()
|
|
for container in allContainers {
|
|
for network in container.configuration.networks {
|
|
networksInUse.insert(network.network)
|
|
}
|
|
}
|
|
|
|
let networksToPrune = allNetworks.filter { network in
|
|
!network.isBuiltin && !networksInUse.contains(network.id)
|
|
}
|
|
|
|
var prunedNetworks = [String]()
|
|
|
|
for network in networksToPrune {
|
|
do {
|
|
try await ClientNetwork.delete(id: network.id)
|
|
prunedNetworks.append(network.id)
|
|
} catch {
|
|
// Note: This failure may occur due to a race condition between the network/
|
|
// container collection above and a container run command that attaches to a
|
|
// network listed in the networksToPrune collection.
|
|
log.error(
|
|
"failed to prune network",
|
|
metadata: [
|
|
"id": "\(network.id)",
|
|
"error": "\(error)",
|
|
])
|
|
}
|
|
}
|
|
|
|
for name in prunedNetworks {
|
|
print(name)
|
|
}
|
|
}
|
|
}
|
|
}
|