mirror of
https://github.com/apple/container.git
synced 2026-07-14 21:47:01 +00:00
J Logan
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
93 lines
3.1 KiB
Swift
93 lines
3.1 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 Containerization
|
|
import ContainerizationOCI
|
|
import TerminalProgress
|
|
|
|
extension Application {
|
|
public struct ImagePush: AsyncParsableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "push",
|
|
abstract: "Push an image"
|
|
)
|
|
|
|
@OptionGroup
|
|
var registry: Flags.Registry
|
|
|
|
@OptionGroup
|
|
var progressFlags: Flags.Progress
|
|
|
|
@Option(
|
|
name: .shortAndLong,
|
|
help: "Limit the push to the specified architecture"
|
|
)
|
|
var arch: String?
|
|
|
|
@Option(
|
|
help: "Limit the push to the specified OS"
|
|
)
|
|
var os: String?
|
|
|
|
@Option(help: "Limit the push to the specified platform (format: os/arch[/variant], takes precedence over --os and --arch)")
|
|
var platform: String?
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
@Argument var reference: String
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
var p: Platform?
|
|
if let platform {
|
|
p = try Platform(from: platform)
|
|
} else if let arch {
|
|
p = try Platform(from: "\(os ?? "linux")/\(arch)")
|
|
} else if let os {
|
|
p = try Platform(from: "\(os)/\(arch ?? Arch.hostArchitecture().rawValue)")
|
|
}
|
|
|
|
let scheme = try RequestScheme(registry.scheme)
|
|
let image = try await ClientImage.get(reference: reference)
|
|
|
|
var progressConfig: ProgressConfig
|
|
switch self.progressFlags.progress {
|
|
case .none: progressConfig = try ProgressConfig(disableProgressUpdates: true)
|
|
case .ansi:
|
|
progressConfig = try ProgressConfig(
|
|
description: "Pushing image \(image.reference)",
|
|
itemsName: "blobs",
|
|
showItems: true,
|
|
showSpeed: false,
|
|
ignoreSmallSize: true
|
|
)
|
|
}
|
|
|
|
let progress = ProgressBar(config: progressConfig)
|
|
defer {
|
|
progress.finish()
|
|
}
|
|
progress.start()
|
|
_ = try await image.push(platform: p, scheme: scheme, progressUpdate: progress.handler)
|
|
progress.finish()
|
|
}
|
|
}
|
|
}
|