mirror of
https://github.com/apple/container.git
synced 2026-07-21 00:41:32 +00:00
Kathryn BaldaufandGitHub
25ab5934e4
## Type of Change - [x] Bug fix ## Motivation and Context Many CLI commands need to reference the system configurations for `container`. Previously, CLI commands would try to load the system configurations from the default application root location, regardless of if `container` had been started with a custom application root location. This PR fixes that issue by having each CLI command ping the APIServer's health check service to get the correct app root path. Closes https://github.com/apple/container/issues/1576 ## Testing - [x] Tested locally Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
69 lines
2.5 KiB
Swift
69 lines
2.5 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 ContainerPersistence
|
|
import ContainerResource
|
|
import ContainerizationError
|
|
import Foundation
|
|
|
|
extension Application {
|
|
public struct ImageInspect: AsyncLoggableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "inspect",
|
|
abstract: "Display information about one or more images")
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
@Argument(help: "Images to inspect")
|
|
var images: [String]
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let containerSystemConfig: ContainerSystemConfig = try await Application.loadContainerSystemConfig()
|
|
let uniqueNames = Set(images)
|
|
let result = try await ClientImage.get(
|
|
names: Array(uniqueNames), containerSystemConfig: containerSystemConfig
|
|
)
|
|
|
|
if !result.error.isEmpty {
|
|
let missing = result.error.sorted()
|
|
throw ContainerizationError(
|
|
.notFound,
|
|
message: "image not found: \(missing.joined(separator: ", "))"
|
|
)
|
|
}
|
|
|
|
var printable: [ImageDetail] = []
|
|
for image in result.images {
|
|
guard
|
|
!Utility.isInfraImage(
|
|
name: image.reference,
|
|
builderImage: containerSystemConfig.build.image,
|
|
initImage: containerSystemConfig.vminit.image
|
|
)
|
|
else { continue }
|
|
printable.append(try await image.details())
|
|
}
|
|
|
|
try Output.emit(Output.renderJSON(printable))
|
|
}
|
|
}
|
|
}
|