lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-22 07:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ability to export initfs as block (#268)

Browse Source 
This refactors the rootfs command to produce an image and have the
ability to create an ext4 formatted block of the init filesystem
directly from the command.

closes #220

Signed-off-by: crosbymichael <michael_crosby@apple.com>
This commit is contained in:
Michael Crosby
2025-08-15 00:12:14 -07:00
committed by GitHub
parent e08b0d4fb4
commit 54980872d9
3 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Containerization/Image/Unpacker/EXT4Unpacker.swift
+47 -4
View File
@@ -32,13 +32,56 @@ public struct EXT4Unpacker: Unpacker {
self.blockSizeInBytes = blockSizeInBytes
}
public func unpack(_ image: Image, for platform: Platform, at path: URL, progress: ProgressHandler? = nil) async throws -> Mount {
#if os(macOS)
/// Performs the unpacking of a tar archive into a filesystem.
/// - Parameters:
/// - archive: The archive to unpack.
/// - compression: The compression to use when unpacking the image.
/// - path: The path to the filesystem that will be created.
public func unpack(
archive: URL,
compression: ContainerizationArchive.Filter,
at path: URL
) throws {
let cleanedPath = try prepareUnpackPath(path: path)
let filesystem = try EXT4.Formatter(
FilePath(cleanedPath),
minDiskSize: blockSizeInBytes
)
defer { try? filesystem.close() }
try filesystem.unpack(
source: archive,
format: .paxRestricted,
compression: compression,
progress: nil
)
}
#endif
/// Returns a `Mount` point after unpacking the image into a filesystem.
/// - Parameters:
/// - image: The image to unpack.
/// - platform: The platform content to unpack.
/// - path: The path to the directory where the filesystem will be created.
/// - progress: The progress handler to invoke as the unpacking progresses.
public func unpack(
_ image: Image,
for platform: Platform,
at path: URL,
progress: ProgressHandler? = nil
) async throws -> Mount {
#if !os(macOS)
throw ContainerizationError(.unsupported, message: "Cannot unpack an image on current platform")
#else
let blockPath = try prepareUnpackPath(path: path)
let cleanedPath = try prepareUnpackPath(path: path)
let manifest = try await image.manifest(for: platform)
let filesystem = try EXT4.Formatter(FilePath(path), minDiskSize: blockSizeInBytes)
let filesystem = try EXT4.Formatter(
FilePath(
cleanedPath
),
minDiskSize: blockSizeInBytes
)
defer { try? filesystem.close() }
for layer in manifest.layers {
@@ -64,7 +107,7 @@ public struct EXT4Unpacker: Unpacker {
return .block(
format: "ext4",
source: blockPath,
source: cleanedPath,
destination: "/",
options: []
)