Add container attach/detach support #259
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // Copyright © 2025 Apple Inc. and the container project authors. All rights reserved. | ||
| // | ||
| // 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 ContainerClient | ||
| import ContainerizationError | ||
| import ContainerizationOS | ||
| import Foundation | ||
|
|
||
| extension Application { | ||
| struct ContainerAttach: AsyncParsableCommand { | ||
| static let configuration = CommandConfiguration( | ||
| commandName: "attach", | ||
| abstract: "Attach to a running container with PTY session support") | ||
|
|
||
| @OptionGroup | ||
| var global: Flags.Global | ||
|
|
||
| @Flag(name: .long, help: "Do not send buffered history when attaching") | ||
| var noHistory = false | ||
|
|
||
| @Option(name: .customLong("detach-keys"), help: "Override the key sequence for detaching a container") | ||
| var detachKeys: String? | ||
|
|
||
| @Argument(help: "Container ID or name to attach to") | ||
| var container: String | ||
|
|
||
| func run() async throws { | ||
| // Get container info | ||
| let container = try await ClientContainer.get(id: container) | ||
| try ensureRunning(container: container) | ||
|
|
||
| // Check if container has terminal enabled | ||
| guard container.configuration.initProcess.terminal else { | ||
|
Member
There was a problem hiding this comment. Why? If you just wanted to attach to see stdout/err really quick this shouldn't be required I'd imagine. Likewise even if you wanted to pipe some stdin I'd think you wouldn't need a pty |
||
| throw ContainerizationError( | ||
| .invalidArgument, | ||
| message: "Cannot attach to container without terminal enabled" | ||
| ) | ||
| } | ||
|
|
||
| log.info("Attaching to container", metadata: ["container": "\(container.id)"]) | ||
|
|
||
| // Create attach client process | ||
| let process = try await container.attachToSession(sendHistory: !noHistory) | ||
|
|
||
| // Run the attached session | ||
| let exitCode = try await runAttachedSession(process: process) | ||
|
|
||
| if exitCode != 0 { | ||
| throw ArgumentParser.ExitCode(exitCode) | ||
| } | ||
| } | ||
|
|
||
| private func runAttachedSession(process: ClientProcess) async throws -> Int32 { | ||
| // Get handles from the attach response | ||
| let handles = try await process.getAttachHandles() | ||
|
|
||
| // Create ProcessIO for the attached session with detach key support | ||
| let io = try ProcessIO.createServerOwned(tty: true, handles: handles, detachKeys: detachKeys) | ||
|
|
||
| // Run with standard process handling | ||
| return try await Application.handleProcess( | ||
| io: io, | ||
| process: process, | ||
| serverOwnedStdio: true | ||
| ) | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could not be happier about this 😆 I was honestly hoping someone would implement it.