add pull flag for fetching latest image

Author: saehejkang

Sources/ContainerBuild/BuildImageResolver.swift

@@ -26,11 +26,13 @@ struct BuildImageResolver: BuildPipelineHandler {
     let contentStore: ContentStore
     let quiet: Bool
     let output: FileHandle
+    let pull: Bool
 
-    public init(_ contentStore: ContentStore, quiet: Bool = false, output: FileHandle = FileHandle.standardError) throws {
+    public init(_ contentStore: ContentStore, quiet: Bool = false, output: FileHandle = FileHandle.standardError, pull: Bool = false) throws {
         self.contentStore = contentStore
         self.quiet = quiet
         self.output = output
+        self.pull = pull
     }
 
     func accept(_ packet: ServerStream) throws -> Bool {
@@ -72,8 +74,14 @@ struct BuildImageResolver: BuildPipelineHandler {
             defer { progress.finish() }
             progress.start()
 
-            guard let img = try? await ClientImage.pull(reference: ref, platform: platform, progressUpdate: progress.handler) else {
-                return try await ClientImage.fetch(reference: ref, platform: platform, progressUpdate: progress.handler)
+            if self.pull {
+                return try await ClientImage.pull(reference: ref, platform: platform)
+            }
+
+            // Try and fetch locally cached image
+            guard let img = try? await ClientImage.fetch(reference: ref, platform: platform) else {
+                // Fall back to pulling image
+                return try await ClientImage.pull(reference: ref, platform: platform)
             }
             return img
         }()

Sources/ContainerBuild/BuildPipelineHandler.swift

@@ -30,7 +30,7 @@ public actor BuildPipeline {
             [
                 try BuildFSSync(URL(filePath: config.contextDir)),
                 try BuildRemoteContentProxy(config.contentStore),
-                try BuildImageResolver(config.contentStore, quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError),
+                try BuildImageResolver(config.contentStore, quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError, pull: config.pull),
                 try BuildStdio(quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError),
             ]
     }

Sources/ContainerBuild/Builder.swift

@@ -249,6 +249,7 @@ public struct Builder: Sendable {
         public let exports: [BuildExport]
         public let cacheIn: [String]
         public let cacheOut: [String]
+        public let pull: Bool
 
         public init(
             buildID: String,
@@ -266,6 +267,7 @@ public struct Builder: Sendable {
             exports: [BuildExport],
             cacheIn: [String],
             cacheOut: [String],
+            pull: Bool
         ) {
             self.buildID = buildID
             self.contentStore = contentStore
@@ -282,6 +284,7 @@ public struct Builder: Sendable {
             self.exports = exports
             self.cacheIn = cacheIn
             self.cacheOut = cacheOut
+            self.pull = pull
         }
     }
 }

Sources/ContainerCommands/BuildCommand.swift

@@ -125,6 +125,9 @@ extension Application {
         @Argument(help: "Build directory")
         var contextDir: String = "."
 
+        @Flag(name: .long, help: "Pull latest image")
+        var pull: Bool = false
+
         public func run() async throws {
             do {
                 let timeout: Duration = .seconds(300)
@@ -278,7 +281,7 @@ extension Application {
                         }
                         return results
                     }()
-                    group.addTask { [terminal, buildArg, contextDir, label, noCache, target, quiet, cacheIn, cacheOut] in
+                    group.addTask { [terminal, buildArg, contextDir, label, noCache, target, quiet, cacheIn, cacheOut, pull] in
                         let config = Builder.BuildConfig(
                             buildID: buildID,
                             contentStore: RemoteContentStoreClient(),
@@ -294,7 +297,8 @@ extension Application {
                             quiet: quiet,
                             exports: exports,
                             cacheIn: cacheIn,
-                            cacheOut: cacheOut
+                            cacheOut: cacheOut,
+                            pull: pull
                         )
                         progress.finish()