Merge branch 'main' into issue-383

Author: jglogan

CONTRIBUTORS.txt

@@ -0,0 +1,3 @@
+# Maintainers
+
+See [MAINTAINERS](https://github.com/apple/containerization/blob/main/MAINTAINERS.txt) for the list of current and former maintainers of this project. Thank you for all your contributions!

MAINTAINERS.txt

@@ -183,6 +183,7 @@ integration: init-block
 		$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 		$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 		$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
+		$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 		echo Ensuring apiserver stopped after the CLI integration tests ; \
 		scripts/ensure-container-stopped.sh ; \
 		exit $${exit_code} ; \

Makefile

@@ -23,7 +23,7 @@ import PackageDescription
 let releaseVersion = ProcessInfo.processInfo.environment["RELEASE_VERSION"] ?? "0.0.0"
 let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
 let builderShimVersion = "0.7.0"
-let scVersion = "0.16.0"
+let scVersion = "0.16.1"
 
 let package = Package(
     name: "container",

Package.resolved

@@ -220,7 +220,13 @@ extension ClientImage {
         })
     }
 
-    public static func pull(reference: String, platform: Platform? = nil, scheme: RequestScheme = .auto, progressUpdate: ProgressUpdateHandler? = nil) async throws -> ClientImage {
+    public static func pull(
+        reference: String, platform: Platform? = nil, scheme: RequestScheme = .auto, progressUpdate: ProgressUpdateHandler? = nil, maxConcurrentDownloads: Int = 3
+    ) async throws -> ClientImage {
+        guard maxConcurrentDownloads > 0 else {
+            throw ContainerizationError(.invalidArgument, message: "maximum number of concurrent downloads must be greater than 0, got \(maxConcurrentDownloads)")
+        }
+
         let client = newXPCClient()
         let request = newRequest(.imagePull)
 
@@ -234,6 +240,7 @@ extension ClientImage {
 
         let insecure = try scheme.schemeFor(host: host) == .http
         request.set(key: .insecureFlag, value: insecure)
+        request.set(key: .maxConcurrentDownloads, value: Int64(maxConcurrentDownloads))
 
         var progressUpdateClient: ProgressUpdateClient?
         if let progressUpdate {
@@ -313,8 +320,9 @@ extension ClientImage {
         return (totalCount: total, activeCount: active, totalSize: size, reclaimableSize: reclaimable)
     }
 
-    public static func fetch(reference: String, platform: Platform? = nil, scheme: RequestScheme = .auto, progressUpdate: ProgressUpdateHandler? = nil) async throws -> ClientImage
-    {
+    public static func fetch(
+        reference: String, platform: Platform? = nil, scheme: RequestScheme = .auto, progressUpdate: ProgressUpdateHandler? = nil, maxConcurrentDownloads: Int = 3
+    ) async throws -> ClientImage {
         do {
             let match = try await self.get(reference: reference)
             if let platform {
@@ -327,7 +335,7 @@ extension ClientImage {
             guard err.isCode(.notFound) else {
                 throw err
             }
-            return try await Self.pull(reference: reference, platform: platform, scheme: scheme, progressUpdate: progressUpdate)
+            return try await Self.pull(reference: reference, platform: platform, scheme: scheme, progressUpdate: progressUpdate, maxConcurrentDownloads: maxConcurrentDownloads)
         }
     }
 }

Package.swift

@@ -81,18 +81,13 @@ public struct ClientVolume {
         return try JSONDecoder().decode(Volume.self, from: responseData)
     }
 
-    public static func prune() async throws -> ([String], UInt64) {
+    public static func volumeDiskUsage(name: String) async throws -> UInt64 {
         let client = XPCClient(service: serviceIdentifier)
-        let message = XPCMessage(route: .volumePrune)
+        let message = XPCMessage(route: .volumeDiskUsage)
+        message.set(key: .volumeName, value: name)
         let reply = try await client.send(message)
 
-        guard let responseData = reply.dataNoCopy(key: .volumes) else {
-            return ([], 0)
-        }
-
-        let volumeNames = try JSONDecoder().decode([String].self, from: responseData)
         let size = reply.uint64(key: .volumeSize)
-        return (volumeNames, size)
+        return size
     }
-
 }

Sources/ContainerClient/Core/ClientImage.swift

@@ -87,7 +87,7 @@ public struct Filesystem: Sendable, Codable {
     /// A block based filesystem.
     public static func block(
         format: String, source: String, destination: String, options: MountOptions, cache: CacheMode = .auto,
-        sync: SyncMode = .full
+        sync: SyncMode = .fsync
     ) -> Filesystem {
         .init(
             type: .block(format: format, cache: cache, sync: sync),
@@ -100,7 +100,7 @@ public struct Filesystem: Sendable, Codable {
     /// A named volume filesystem.
     public static func volume(
         name: String, format: String, source: String, destination: String, options: MountOptions,
-        cache: CacheMode = .auto, sync: SyncMode = .full
+        cache: CacheMode = .auto, sync: SyncMode = .fsync
     ) -> Filesystem {
         .init(
             type: .volume(name: name, format: format, cache: cache, sync: sync),

Sources/ContainerClient/Core/ClientVolume.swift

@@ -157,8 +157,8 @@ public enum XPCRoute: String {
     case volumeDelete
     case volumeList
     case volumeInspect
-    case volumePrune
 
+    case volumeDiskUsage
     case systemDiskUsage
 
     case ping

Sources/ContainerClient/Core/Filesystem.swift

@@ -215,4 +215,11 @@ public struct Flags {
         @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type"))
         public var progress: ProgressType = .ansi
     }
+
+    public struct ImageFetch: ParsableArguments {
+        public init() {}
+
+        @Option(name: .long, help: "Maximum number of concurrent downloads (default: 3)")
+        public var maxConcurrentDownloads: Int = 3
+    }
 }