mirror of
https://github.com/apple/container.git
synced 2026-07-13 04:57:08 +00:00
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
102 lines
3.9 KiB
Swift
102 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 Containerization
|
|
import ContainerizationError
|
|
import Foundation
|
|
import TerminalProgress
|
|
|
|
extension Application {
|
|
public struct ImageLoad: AsyncParsableCommand {
|
|
public init() {}
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "load",
|
|
abstract: "Load images from an OCI compatible tar archive"
|
|
)
|
|
|
|
@Option(
|
|
name: .shortAndLong, help: "Path to the image tar archive", completion: .file(),
|
|
transform: { str in
|
|
URL(fileURLWithPath: str, relativeTo: .currentDirectory()).absoluteURL.path(percentEncoded: false)
|
|
})
|
|
var input: String?
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
public func run() async throws {
|
|
let tempFile = FileManager.default.temporaryDirectory.appendingPathComponent("\(UUID().uuidString).tar")
|
|
defer {
|
|
try? FileManager.default.removeItem(at: tempFile)
|
|
}
|
|
|
|
// Read from stdin; otherwise read from the input file
|
|
if input == nil {
|
|
guard FileManager.default.createFile(atPath: tempFile.path(), contents: nil) else {
|
|
throw ContainerizationError(.internalError, message: "unable to create temporary file")
|
|
}
|
|
|
|
guard let fileHandle = try? FileHandle(forWritingTo: tempFile) else {
|
|
throw ContainerizationError(.internalError, message: "unable to open temporary file for writing")
|
|
}
|
|
|
|
let bufferSize = 4096
|
|
while true {
|
|
let chunk = FileHandle.standardInput.readData(ofLength: bufferSize)
|
|
if chunk.isEmpty { break }
|
|
fileHandle.write(chunk)
|
|
}
|
|
try fileHandle.close()
|
|
} else {
|
|
guard FileManager.default.fileExists(atPath: input!) else {
|
|
print("File does not exist \(input!)")
|
|
Application.exit(withError: ArgumentParser.ExitCode(1))
|
|
}
|
|
}
|
|
|
|
let progressConfig = try ProgressConfig(
|
|
showTasks: true,
|
|
showItems: true,
|
|
totalTasks: 2
|
|
)
|
|
let progress = ProgressBar(config: progressConfig)
|
|
defer {
|
|
progress.finish()
|
|
}
|
|
progress.start()
|
|
|
|
progress.set(description: "Loading tar archive")
|
|
let loaded = try await ClientImage.load(from: input ?? tempFile.path())
|
|
|
|
let taskManager = ProgressTaskCoordinator()
|
|
let unpackTask = await taskManager.startTask()
|
|
progress.set(description: "Unpacking image")
|
|
progress.set(itemsName: "entries")
|
|
for image in loaded {
|
|
try await image.unpack(platform: nil, progressUpdate: ProgressTaskCoordinator.handler(for: unpackTask, from: progress.handler))
|
|
}
|
|
await taskManager.finish()
|
|
progress.finish()
|
|
print("Loaded images:")
|
|
for image in loaded {
|
|
print(image.reference)
|
|
}
|
|
}
|
|
}
|
|
}
|