mirror of
https://github.com/apple/container.git
synced 2026-09-13 11:15:41 +00:00
Danny Canter
8fdfa29728
ClientContainer was honestly extremely awkward. It could only be created by passing either a ContainerConfiguration, or a Snapshot that had to be obtained from calling a static method on the type itself. The type also did not store a connection, so every single method got a new xpc connection to the APIServer. This change aims to rework this type to be just a generic client, that is *not* a client for one specific container, but for any. - Rename to ContainerClient - Have list() return [ContainerSnapshot] - Create a connection in the constructor - Change all the callsites to use the new API - Small, somewhat related, change to logs API in the APIServer. Now that we don't need to call get() to grab a client anymore which was typically what did "does this container exist" logic and gave a nice error message, I added a small check in the APIServer to see if the container exists and return mostly the same error message.
119 lines
3.9 KiB
Swift
119 lines
3.9 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 containers = try await client.list()
|
|
try printContainers(containers: containers, format: format)
|
|
}
|
|
|
|
private func createHeader() -> [[String]] {
|
|
[["ID", "IMAGE", "OS", "ARCH", "STATE", "ADDR", "CPUS", "MEMORY", "STARTED"]]
|
|
}
|
|
|
|
private func printContainers(containers: [ContainerSnapshot], format: ListFormat) throws {
|
|
if format == .json {
|
|
let printables = containers.map {
|
|
PrintableContainer($0)
|
|
}
|
|
let data = try JSONEncoder().encode(printables)
|
|
print(String(data: data, encoding: .utf8)!)
|
|
|
|
return
|
|
}
|
|
|
|
if self.quiet {
|
|
containers.forEach {
|
|
if !self.all && $0.status != .running {
|
|
return
|
|
}
|
|
print($0.id)
|
|
}
|
|
return
|
|
}
|
|
|
|
var rows = createHeader()
|
|
for container in containers {
|
|
if !self.all && container.status != .running {
|
|
continue
|
|
}
|
|
rows.append(container.asRow)
|
|
}
|
|
|
|
let formatter = TableOutput(rows: rows)
|
|
print(formatter.format())
|
|
}
|
|
}
|
|
}
|
|
|
|
extension ContainerSnapshot {
|
|
fileprivate var asRow: [String] {
|
|
[
|
|
self.id,
|
|
self.configuration.image.reference,
|
|
self.platform.os,
|
|
self.platform.architecture,
|
|
self.status.rawValue,
|
|
self.networks.compactMap { $0.ipv4Address.description }.joined(separator: ","),
|
|
"\(self.configuration.resources.cpus)",
|
|
"\(self.configuration.resources.memoryInBytes / (1024 * 1024)) MB",
|
|
self.startedDate.map { ISO8601DateFormatter().string(from: $0) } ?? "",
|
|
]
|
|
}
|
|
}
|
|
|
|
struct PrintableContainer: Codable {
|
|
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
|
|
}
|
|
}
|