mirror of
https://github.com/apple/container.git
synced 2026-07-23 09:51:30 +00:00
RajandGitHub
822b47b877
- Closes #1528. - Several commands (`builder status`, `image list`, `stats`, `system df`, `system status`) advertised `--format yaml` and `--format toml` but only handled `json`, and every other format fell through to the table. With this PR, we now route them through one shared renderer with an exhaustive switch over the format enum, so a missing format would now be a compile error, and not just fail silently. - Since TOML has no top level array, TOML output now wraps list payloads under an `items` key, because otherwise it was returning nothing for lists. - `stats` now prints one static result for machine readable formats instead of opening its live table view. - `builder status` now returns an empty list for json/yaml/toml when no builder is running, instead of the unparseable "builder is not running" text. The table view keeps the message. - with `--quiet` and no builder it now exits 0 with no output, earlier it exited non-zero.
92 lines
3.2 KiB
Swift
92 lines
3.2 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 ContainerResource
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
import SwiftProtobuf
|
|
|
|
extension Application {
|
|
public struct ContainerList: AsyncLoggableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "list",
|
|
abstract: "List running containers",
|
|
aliases: ["ls"])
|
|
|
|
@Flag(name: .shortAndLong, help: "Include containers that are not running")
|
|
var all = false
|
|
|
|
@Option(name: .long, help: "Format of the output")
|
|
var format: ListFormat = .table
|
|
|
|
@Flag(name: .shortAndLong, help: "Only output the container ID")
|
|
var quiet = false
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let client = ContainerClient()
|
|
let filters = self.all ? ContainerListFilters.all : ContainerListFilters(status: .running)
|
|
let containers = try await client.list(filters: filters)
|
|
let items = containers.map { PrintableContainer($0) }
|
|
try Output.render(payload: items, display: items, format: format, quiet: quiet)
|
|
}
|
|
}
|
|
}
|
|
|
|
extension PrintableContainer: ListDisplayable {
|
|
static var tableHeader: [String] {
|
|
["ID", "IMAGE", "OS", "ARCH", "STATE", "IP", "CPUS", "MEMORY", "STARTED"]
|
|
}
|
|
|
|
var tableRow: [String] {
|
|
[
|
|
self.configuration.id,
|
|
self.configuration.image.reference,
|
|
self.configuration.platform.os,
|
|
self.configuration.platform.architecture,
|
|
self.status.rawValue,
|
|
self.networks.map { $0.ipv4Address.description }.joined(separator: ","),
|
|
"\(self.configuration.resources.cpus)",
|
|
"\(self.configuration.resources.memoryInBytes / (1024 * 1024)) MB",
|
|
self.startedDate?.ISO8601Format() ?? "",
|
|
]
|
|
}
|
|
|
|
var quietValue: String {
|
|
self.configuration.id
|
|
}
|
|
}
|
|
|
|
struct PrintableContainer: Codable, Sendable {
|
|
let status: RuntimeStatus
|
|
let configuration: ContainerConfiguration
|
|
let networks: [Attachment]
|
|
let startedDate: Date?
|
|
|
|
init(_ container: ContainerSnapshot) {
|
|
self.status = container.status
|
|
self.configuration = container.configuration
|
|
self.networks = container.networks
|
|
self.startedDate = container.startedDate
|
|
}
|
|
}
|