mirror of
https://github.com/apple/container.git
synced 2026-07-14 05:27:02 +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
61 lines
2.4 KiB
Swift
61 lines
2.4 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 ContainerPlugin
|
|
import ContainerizationError
|
|
import Foundation
|
|
import Logging
|
|
|
|
extension Application {
|
|
public struct SystemStatus: AsyncParsableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "status",
|
|
abstract: "Show the status of `container` services"
|
|
)
|
|
|
|
@Option(name: .shortAndLong, help: "Launchd prefix for services")
|
|
var prefix: String = "com.apple.container."
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let isRegistered = try ServiceManager.isRegistered(fullServiceLabel: "\(prefix)apiserver")
|
|
if !isRegistered {
|
|
print("apiserver is not running and not registered with launchd")
|
|
Application.exit(withError: ExitCode(1))
|
|
}
|
|
|
|
// Now ping our friendly daemon. Fail after 10 seconds with no response.
|
|
do {
|
|
let systemHealth = try await ClientHealthCheck.ping(timeout: .seconds(10))
|
|
print("apiserver is running")
|
|
print("application data root: \(systemHealth.appRoot.path(percentEncoded: false))")
|
|
print("application install root: \(systemHealth.installRoot.path(percentEncoded: false))")
|
|
print("container-apiserver version: \(systemHealth.apiServerVersion)")
|
|
print("container-apiserver commit: \(systemHealth.apiServerCommit)")
|
|
} catch {
|
|
print("apiserver is not running")
|
|
Application.exit(withError: ExitCode(1))
|
|
}
|
|
}
|
|
}
|
|
}
|