mirror of
https://github.com/apple/container.git
synced 2026-07-12 20:47:04 +00:00
Danny Canter
8fdfa29728
ClientContainer was honestly extremely awkward. It could only be created by passing either a ContainerConfiguration, or a Snapshot that had to be obtained from calling a static method on the type itself. The type also did not store a connection, so every single method got a new xpc connection to the APIServer. This change aims to rework this type to be just a generic client, that is *not* a client for one specific container, but for any. - Rename to ContainerClient - Have list() return [ContainerSnapshot] - Create a connection in the constructor - Change all the callsites to use the new API - Small, somewhat related, change to logs API in the APIServer. Now that we don't need to call get() to grab a client anymore which was typically what did "does this container exist" logic and gave a nice error message, I added a small check in the APIServer to see if the container exists and return mostly the same error message.
116 lines
4.2 KiB
Swift
116 lines
4.2 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 ContainerizationError
|
|
import ContainerizationOS
|
|
import Foundation
|
|
|
|
extension Application {
|
|
public struct ContainerExec: AsyncLoggableCommand {
|
|
public init() {}
|
|
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "exec",
|
|
abstract: "Run a new command in a running container")
|
|
|
|
@OptionGroup(title: "Process options")
|
|
var processFlags: Flags.Process
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
@Flag(name: .shortAndLong, help: "Run the process and detach from it")
|
|
var detach = false
|
|
|
|
@Argument(help: "Container ID")
|
|
var containerId: String
|
|
|
|
@Argument(parsing: .captureForPassthrough, help: "New process arguments")
|
|
var arguments: [String]
|
|
|
|
public func run() async throws {
|
|
var exitCode: Int32 = 127
|
|
let client = ContainerClient()
|
|
let container = try await client.get(id: containerId)
|
|
try ensureRunning(container: container)
|
|
|
|
let stdin = self.processFlags.interactive
|
|
let tty = self.processFlags.tty
|
|
|
|
var config = container.configuration.initProcess
|
|
config.executable = arguments.first!
|
|
config.arguments = [String](self.arguments.dropFirst())
|
|
config.terminal = tty
|
|
config.environment.append(
|
|
contentsOf: try Parser.allEnv(
|
|
imageEnvs: [],
|
|
envFiles: self.processFlags.envFile,
|
|
envs: self.processFlags.env
|
|
))
|
|
|
|
if let cwd = self.processFlags.cwd {
|
|
config.workingDirectory = cwd
|
|
}
|
|
|
|
let defaultUser = config.user
|
|
let (user, additionalGroups) = Parser.user(
|
|
user: processFlags.user, uid: processFlags.uid,
|
|
gid: processFlags.gid, defaultUser: defaultUser)
|
|
config.user = user
|
|
config.supplementalGroups.append(contentsOf: additionalGroups)
|
|
|
|
do {
|
|
let io = try ProcessIO.create(tty: tty, interactive: stdin, detach: self.detach)
|
|
defer {
|
|
try? io.close()
|
|
}
|
|
|
|
let process = try await client.createProcess(
|
|
containerId: container.id,
|
|
processId: UUID().uuidString.lowercased(),
|
|
configuration: config,
|
|
stdio: io.stdio
|
|
)
|
|
|
|
if self.detach {
|
|
try await process.start()
|
|
try io.closeAfterStart()
|
|
print(containerId)
|
|
return
|
|
}
|
|
|
|
if !self.processFlags.tty {
|
|
var handler = SignalThreshold(threshold: 3, signals: [SIGINT, SIGTERM])
|
|
handler.start {
|
|
print("Received 3 SIGINT/SIGTERM's, forcefully exiting.")
|
|
Darwin.exit(1)
|
|
}
|
|
}
|
|
|
|
exitCode = try await io.handleProcess(process: process, log: log)
|
|
} catch {
|
|
if error is ContainerizationError {
|
|
throw error
|
|
}
|
|
throw ContainerizationError(.internalError, message: "failed to exec process \(error)")
|
|
}
|
|
throw ArgumentParser.ExitCode(exitCode)
|
|
}
|
|
}
|
|
}
|