File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed
Plugins/ContainerImageBuilder Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -89,10 +89,18 @@ extension PluginError: CustomStringConvertible {
89
89
90
90
for built in builtExecutables { Diagnostics . remark ( " Built product: \( built. url. path) " ) }
91
91
92
+ let resources = builtExecutables [ 0 ] . url
93
+ . deletingLastPathComponent ( )
94
+ . appendingPathComponent (
95
+ " \( context. package . displayName) _ \( productName) .resources "
96
+ )
97
+
92
98
// Run a command line helper to upload the image
93
- let helper = try context. tool ( named: " containertool " )
94
- let helperURL = helper. url
95
- let helperArgs = extractor. remainingArguments + builtExecutables. map { $0. url. path }
99
+ let helperURL = try context. tool ( named: " containertool " ) . url
100
+ let helperArgs =
101
+ ( FileManager . default. fileExists ( atPath: resources. path) ? [ " --resources " , resources. path] : [ ] )
102
+ + extractor. remainingArguments
103
+ + builtExecutables. map { $0. url. path }
96
104
let helperEnv = ProcessInfo . processInfo. environment. filter { $0. key. starts ( with: " CONTAINERTOOL_ " ) }
97
105
98
106
let err = Pipe ( )
You can’t perform that action at this time.
0 commit comments