mirror of
https://github.com/apple/container.git
synced 2026-07-13 21:17:05 +00:00
Kathryn Baldauf
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>
111 lines
4.0 KiB
Swift
111 lines
4.0 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 ContainerPlugin
|
|
import Containerization
|
|
import ContainerizationOCI
|
|
import TerminalProgress
|
|
|
|
extension Application {
|
|
public struct ImagePull: AsyncLoggableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "pull",
|
|
abstract: "Pull an image"
|
|
)
|
|
|
|
@OptionGroup
|
|
var registry: Flags.Registry
|
|
|
|
@OptionGroup
|
|
var progressFlags: Flags.Progress
|
|
|
|
@OptionGroup
|
|
var imageFetchFlags: Flags.ImageFetch
|
|
|
|
@Option(
|
|
name: .shortAndLong,
|
|
help: "Limit the pull to the specified architecture"
|
|
)
|
|
var arch: String?
|
|
|
|
@Option(
|
|
help: "Limit the pull to the specified OS"
|
|
)
|
|
var os: String?
|
|
|
|
@Option(
|
|
help: "Limit the pull to the specified platform (format: os/arch[/variant], takes precedence over --os and --arch) [environment: CONTAINER_DEFAULT_PLATFORM]"
|
|
)
|
|
var platform: String?
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
@Argument var reference: String
|
|
|
|
public init() {}
|
|
|
|
public init(platform: String? = nil, scheme: String = "auto", reference: String) {
|
|
self.logOptions = Flags.Logging()
|
|
self.registry = Flags.Registry(scheme: scheme)
|
|
self.platform = platform
|
|
self.reference = reference
|
|
}
|
|
|
|
public func run() async throws {
|
|
let containerSystemConfig: ContainerSystemConfig = try await Application.loadContainerSystemConfig()
|
|
let p = try DefaultPlatform.resolve(platform: platform, os: os, arch: arch, log: log)
|
|
|
|
let scheme = try RequestScheme(registry.scheme)
|
|
|
|
let processedReference = try ClientImage.normalizeReference(reference, containerSystemConfig: containerSystemConfig)
|
|
|
|
let progressConfig = try self.progressFlags.makeConfig(
|
|
showTasks: true,
|
|
showItems: true,
|
|
ignoreSmallSize: true,
|
|
totalTasks: 2
|
|
)
|
|
|
|
let progress = ProgressBar(config: progressConfig)
|
|
defer {
|
|
progress.finish()
|
|
}
|
|
progress.start()
|
|
|
|
progress.set(description: "Fetching image")
|
|
progress.set(itemsName: "blobs")
|
|
let taskManager = ProgressTaskCoordinator()
|
|
let fetchTask = await taskManager.startTask()
|
|
let image = try await ClientImage.pull(
|
|
reference: processedReference, platform: p, scheme: scheme, containerSystemConfig: containerSystemConfig,
|
|
progressUpdate: ProgressTaskCoordinator.handler(for: fetchTask, from: progress.handler),
|
|
maxConcurrentDownloads: self.imageFetchFlags.maxConcurrentDownloads
|
|
)
|
|
|
|
progress.set(description: "Unpacking image")
|
|
progress.set(itemsName: "entries")
|
|
let unpackTask = await taskManager.startTask()
|
|
try await image.unpack(platform: p, progressUpdate: ProgressTaskCoordinator.handler(for: unpackTask, from: progress.handler))
|
|
await taskManager.finish()
|
|
progress.finish()
|
|
}
|
|
}
|
|
}
|