mirror of
https://github.com/apple/container.git
synced 2026-07-13 13:07:06 +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
104 lines
3.8 KiB
Swift
104 lines
3.8 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
|
|
|
|
extension Application {
|
|
public struct RemoveImageOptions: ParsableArguments {
|
|
public init() {}
|
|
|
|
@Flag(name: .shortAndLong, help: "Delete all images")
|
|
var all: Bool = false
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
@Argument
|
|
var images: [String] = []
|
|
}
|
|
|
|
struct DeleteImageImplementation {
|
|
static func validate(options: RemoveImageOptions) throws {
|
|
if options.images.count == 0 && !options.all {
|
|
throw ContainerizationError(.invalidArgument, message: "no images specified and --all not supplied")
|
|
}
|
|
if options.images.count > 0 && options.all {
|
|
throw ContainerizationError(.invalidArgument, message: "explicitly supplied images conflict with the --all flag")
|
|
}
|
|
}
|
|
|
|
static func removeImage(options: RemoveImageOptions) async throws {
|
|
let (found, notFound) = try await {
|
|
if options.all {
|
|
let found = try await ClientImage.list()
|
|
let notFound: [String] = []
|
|
return (found, notFound)
|
|
}
|
|
return try await ClientImage.get(names: options.images)
|
|
}()
|
|
var failures: [String] = notFound
|
|
var didDeleteAnyImage = false
|
|
for image in found {
|
|
guard !Utility.isInfraImage(name: image.reference) else {
|
|
continue
|
|
}
|
|
do {
|
|
try await ClientImage.delete(reference: image.reference, garbageCollect: false)
|
|
print(image.reference)
|
|
didDeleteAnyImage = true
|
|
} catch {
|
|
log.error("failed to delete \(image.reference): \(error)")
|
|
failures.append(image.reference)
|
|
}
|
|
}
|
|
let (_, size) = try await ClientImage.cleanupOrphanedBlobs()
|
|
let formatter = ByteCountFormatter()
|
|
let freed = formatter.string(fromByteCount: Int64(size))
|
|
|
|
if didDeleteAnyImage {
|
|
print("Reclaimed \(freed) in disk space")
|
|
}
|
|
if failures.count > 0 {
|
|
throw ContainerizationError(.internalError, message: "failed to delete one or more images: \(failures)")
|
|
}
|
|
}
|
|
}
|
|
|
|
public struct ImageDelete: AsyncParsableCommand {
|
|
@OptionGroup
|
|
var options: RemoveImageOptions
|
|
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "delete",
|
|
abstract: "Delete one or more images",
|
|
aliases: ["rm"])
|
|
|
|
public init() {}
|
|
|
|
public func validate() throws {
|
|
try DeleteImageImplementation.validate(options: options)
|
|
}
|
|
|
|
public mutating func run() async throws {
|
|
try await DeleteImageImplementation.removeImage(options: options)
|
|
}
|
|
}
|
|
}
|