plugin: If a resource bundle is present, pass the path to containertool

Alternatively: check the target input file list for resource files.

Author: euanh

Plugins/ContainerImageBuilder/main.swift

@@ -89,10 +89,18 @@ extension PluginError: CustomStringConvertible {
 
         for built in builtExecutables { Diagnostics.remark("Built product: \(built.url.path)") }
 
+        let resources = builtExecutables[0].url
+            .deletingLastPathComponent()
+            .appendingPathComponent(
+                "\(context.package.displayName)_\(productName).resources"
+            )
+
         // Run a command line helper to upload the image
-        let helper = try context.tool(named: "containertool")
-        let helperURL = helper.url
-        let helperArgs = extractor.remainingArguments + builtExecutables.map { $0.url.path }
+        let helperURL = try context.tool(named: "containertool").url
+        let helperArgs =
+            (FileManager.default.fileExists(atPath: resources.path) ? ["--resources", resources.path] : [])
+            + extractor.remainingArguments
+            + builtExecutables.map { $0.url.path }
         let helperEnv = ProcessInfo.processInfo.environment.filter { $0.key.starts(with: "CONTAINERTOOL_") }
 
         let err = Pipe()

Sources/containertool/containertool.swift

@@ -152,18 +152,20 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
 
         // MARK: Upload resource layers
 
-        var resourceLayers: [RegistryClient.ImageLayer] = []
+        typealias DiffID = String
+        var resourceLayers: [(descriptor: ContentDescriptor, diffID: String)] = []
         for resourceDir in resources {
-            let layer = try await destination.uploadLayer(
+            let resourceTardiff = try Archive().appendingRecursively(atPath: resourceDir).bytes
+            let resourceLayer = try await destination.uploadImageLayer(
                 repository: destination_image.repository,
-                contents: try Archive().appendingRecursively(atPath: resourceDir).bytes
+                layer: resourceTardiff
             )
 
             if verbose {
-                log("resource layer: \(layer.descriptor.digest) (\(layer.descriptor.size) bytes)")
+                log("resource layer: \(resourceLayer.digest) (\(resourceLayer.size) bytes)")
             }
 
-            resourceLayers.append(layer)
+            resourceLayers.append((resourceLayer, digest(of: resourceTardiff)))
         }
 
         // MARK: Upload the application layer
@@ -176,7 +178,6 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
         }
 
         // MARK: Create the application configuration
-
         let timestamp = Date(timeIntervalSince1970: 0).ISO8601Format()
 
         // Inherit the configuration of the base image - UID, GID, environment etc -