mirror of
https://github.com/apple/container.git
synced 2026-07-12 12:37:02 +00:00
b2994ac369
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
`container` runs each workload in an ephemeral VM, so there's no
built-in way to keep a persistent Linux environment you can log into and
work in. `container machine` adds one.
A container machine is a lightweight, persistent, and integrated Linux
environments that feel like an extension of your Mac, created from
standard OCI images with a familiar UX. The login user matches your host
account with passwordless `sudo`, your home directory is mounted inside
the VM, and each machine keeps its filesystem and runs the image's own
init system (such as`systemd` or `openrc`).
```bash
container machine create alpine:3.22 --name my-machine
container machine run -n my-machine # interactive shell
container machine set -n my-machine cpus=4 memory=8G
```
Subcommands: `create`, `run`, `list` (`ls`), `inspect`, `set`,
`set-default`, `logs`, `stop`, `delete` (`rm`); `m` aliases `machine`.
Docs added to `docs/command-reference.md` (Machine Management) and
`docs/how-to.md` ("Use container machines").
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
Signed-off-by: Raj Aryan Singh <rajaryan_singh@apple.com>
Co-authored-by: Jaewon Hur <jaewon_hur@apple.com>
Co-authored-by: John Logan <john_logan@apple.com>
Co-authored-by: Michael Crosby <michael_crosby@apple.com>
Co-authored-by: Eric Ernst <eric_ernst@apple.com>
Co-authored-by: Danny Canter <danny_canter@apple.com>
153 lines
5.3 KiB
Swift
153 lines
5.3 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 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
|
|
import MachineAPIClient
|
|
|
|
extension Application {
|
|
public struct MachineLogs: AsyncLoggableCommand {
|
|
public init() {}
|
|
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "logs",
|
|
abstract: "Fetch container machine logs"
|
|
)
|
|
|
|
@Flag(name: .long, help: "Display the boot log for the container machine instead of stdio")
|
|
var boot: Bool = false
|
|
|
|
@Flag(name: .shortAndLong, help: "Follow log output")
|
|
var follow: Bool = false
|
|
|
|
@Option(name: .short, help: "Number of lines to show from the end of the logs. If not provided this will print all of the logs")
|
|
var numLines: Int?
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
@Argument(help: "Machine VM ID (uses default if not specified)")
|
|
var id: String?
|
|
|
|
public func run() async throws {
|
|
let sigHandler = AsyncSignalHandler.create(notify: [SIGINT, SIGTERM])
|
|
|
|
Task {
|
|
for await _ in sigHandler.signals {
|
|
Darwin.exit(0)
|
|
}
|
|
}
|
|
|
|
let client = MachineClient()
|
|
let id = try await resolveMachineId(id, client: client)
|
|
|
|
let fhs = try await client.logs(id: id)
|
|
let fileHandle = boot ? fhs[1] : fhs[0]
|
|
|
|
try await Self.tail(
|
|
fh: fileHandle,
|
|
n: numLines,
|
|
follow: follow,
|
|
)
|
|
}
|
|
|
|
private static func tail(
|
|
fh: FileHandle,
|
|
n: Int?,
|
|
follow: Bool
|
|
) async throws {
|
|
if let n {
|
|
var buffer = Data()
|
|
let size = try fh.seekToEnd()
|
|
var offset = size
|
|
var lines: [String] = []
|
|
|
|
while offset > 0, lines.count < n {
|
|
let readSize = min(1024, offset)
|
|
offset -= readSize
|
|
try fh.seek(toOffset: offset)
|
|
|
|
let data = fh.readData(ofLength: Int(readSize))
|
|
buffer.insert(contentsOf: data, at: 0)
|
|
|
|
if let chunk = String(data: buffer, encoding: .utf8) {
|
|
lines = chunk.components(separatedBy: .newlines)
|
|
lines = lines.filter { !$0.isEmpty }
|
|
}
|
|
}
|
|
|
|
lines = Array(lines.suffix(n))
|
|
for line in lines {
|
|
print(line)
|
|
}
|
|
} else {
|
|
// Fast path if all they want is the full file.
|
|
guard let data = try fh.readToEnd() else {
|
|
// Seems you get nil if it's a zero byte read, or you
|
|
// try and read from dev/null.
|
|
return
|
|
}
|
|
guard let str = String(data: data, encoding: .utf8) else {
|
|
throw ContainerizationError(
|
|
.internalError,
|
|
message: "failed to convert container logs to utf8"
|
|
)
|
|
}
|
|
print(str.trimmingCharacters(in: .newlines))
|
|
}
|
|
|
|
fflush(stdout)
|
|
if follow {
|
|
setbuf(stdout, nil)
|
|
try await Self.followFile(fh: fh)
|
|
}
|
|
}
|
|
|
|
private static func followFile(fh: FileHandle) async throws {
|
|
_ = try fh.seekToEnd()
|
|
let stream = AsyncStream<String> { cont in
|
|
fh.readabilityHandler = { handle in
|
|
let data = handle.availableData
|
|
if data.isEmpty {
|
|
// Triggers on container restart - can exit here as well
|
|
do {
|
|
_ = try fh.seekToEnd() // To continue streaming existing truncated log files
|
|
} catch {
|
|
fh.readabilityHandler = nil
|
|
cont.finish()
|
|
return
|
|
}
|
|
}
|
|
if let str = String(data: data, encoding: .utf8), !str.isEmpty {
|
|
var lines = str.components(separatedBy: .newlines)
|
|
lines = lines.filter { !$0.isEmpty }
|
|
for line in lines {
|
|
cont.yield(line)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
for await line in stream {
|
|
print(line)
|
|
}
|
|
}
|
|
}
|
|
}
|