Merge branch 'main' into add-builder-tests

jglogan · web-flow · commit 6feebf71ba0f · 2026-02-05T01:14:49.000-08:00
diff --git a/.github/workflows/pr-label-apply.yml b/.github/workflows/pr-label-apply.yml
@@ -29,20 +29,12 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }}
           pattern: pr-metadata-*
           merge-multiple: false
-        continue-on-error: true
         id: download-artifact
       
       - name: Read PR number
         id: pr-number
         run: |
-          METADATA_DIR=$(find . -type d -name "pr-metadata-*" 2>/dev/null | head -n 1)
-          
-          if [ -z "$METADATA_DIR" ]; then
-            echo "No metadata found"
-            exit 1
-          fi
-          
-          PR_NUMBER=$(cat "${METADATA_DIR}/pr-number.txt")
+          PR_NUMBER=$(cat "pr-number.txt")
           echo "number=${PR_NUMBER}" >> $GITHUB_OUTPUT
           echo "PR Number: ${PR_NUMBER}"
       
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -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.8.0"
-let scVersion = "0.24.5"
+let scVersion = "0.25.0"
 
 let package = Package(
     name: "container",
diff --git a/Sources/ContainerBuild/BuildImageResolver.swift b/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,6 +74,9 @@ struct BuildImageResolver: BuildPipelineHandler {
             defer { progress.finish() }
             progress.start()
 
+            if self.pull {
+                return try await ClientImage.pull(reference: ref, platform: platform, progressUpdate: progress.handler)
+            }
             // Use fetch() which checks cache first, then pulls if needed
             return try await ClientImage.fetch(reference: ref, platform: platform, progressUpdate: progress.handler)
         }()
diff --git a/Sources/ContainerBuild/BuildPipelineHandler.swift b/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),
             ]
     }
diff --git a/Sources/ContainerBuild/Builder.swift b/Sources/ContainerBuild/Builder.swift
@@ -251,6 +251,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,
@@ -268,6 +269,7 @@ public struct Builder: Sendable {
             exports: [BuildExport],
             cacheIn: [String],
             cacheOut: [String],
+            pull: Bool
         ) {
             self.buildID = buildID
             self.contentStore = contentStore
@@ -284,6 +286,7 @@ public struct Builder: Sendable {
             self.exports = exports
             self.cacheIn = cacheIn
             self.cacheOut = cacheOut
+            self.pull = pull
         }
     }
 }
diff --git a/Sources/ContainerCommands/BuildCommand.swift b/Sources/ContainerCommands/BuildCommand.swift
@@ -131,6 +131,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)
@@ -313,7 +316,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(),
@@ -329,7 +332,8 @@ extension Application {
                             quiet: quiet,
                             exports: exports,
                             cacheIn: cacheIn,
-                            cacheOut: cacheOut
+                            cacheOut: cacheOut,
+                            pull: pull
                         )
                         progress.finish()
 
diff --git a/Sources/ContainerCommands/Image/ImageDelete.swift b/Sources/ContainerCommands/Image/ImageDelete.swift
@@ -69,7 +69,7 @@ extension Application {
                     failures.append(image.reference)
                 }
             }
-            let (_, size) = try await ClientImage.cleanupOrphanedBlobs()
+            let (_, size) = try await ClientImage.cleanUpOrphanedBlobs()
             let formatter = ByteCountFormatter()
             let freed = formatter.string(fromByteCount: Int64(size))
 
diff --git a/Sources/ContainerCommands/Image/ImagePrune.swift b/Sources/ContainerCommands/Image/ImagePrune.swift
@@ -65,7 +65,7 @@ extension Application {
                 }
             }
 
-            let (deletedDigests, size) = try await ClientImage.cleanupOrphanedBlobs()
+            let (deletedDigests, size) = try await ClientImage.cleanUpOrphanedBlobs()
 
             for image in imagesToPrune {
                 print("untagged \(image.reference)")
diff --git a/Sources/ContainerCommands/Registry/Login.swift b/Sources/ContainerCommands/Registry/Login.swift
@@ -56,9 +56,9 @@ extension Application {
                 }
                 password = String(decoding: passwordData, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
             }
-            let keychain = KeychainHelper(id: Constants.keychainID)
+            let keychain = KeychainHelper(securityDomain: Constants.keychainID)
             if username == "" {
-                username = try keychain.userPrompt(domain: server)
+                username = try keychain.userPrompt(hostname: server)
             }
             if password == "" {
                 password = try keychain.passwordPrompt()
@@ -89,7 +89,7 @@ extension Application {
                 )
             )
             try await client.ping()
-            try keychain.save(domain: server, username: username, password: password)
+            try keychain.save(hostname: server, username: username, password: password)
             print("Login succeeded")
         }
     }
diff --git a/Sources/ContainerCommands/Registry/Logout.swift b/Sources/ContainerCommands/Registry/Logout.swift
@@ -32,9 +32,9 @@ extension Application {
         var registry: String
 
         public func run() async throws {
-            let keychain = KeychainHelper(id: Constants.keychainID)
+            let keychain = KeychainHelper(securityDomain: Constants.keychainID)
             let r = Reference.resolveDomain(domain: registry)
-            try keychain.delete(domain: r)
+            try keychain.delete(hostname: r)
         }
     }
 }
diff --git a/Sources/Helpers/Images/ImagesHelper.swift b/Sources/Helpers/Images/ImagesHelper.swift
@@ -96,7 +96,7 @@ extension ImagesHelper {
             routes[ImagesServiceXPCRoute.imageSave.rawValue] = harness.save
             routes[ImagesServiceXPCRoute.imageLoad.rawValue] = harness.load
             routes[ImagesServiceXPCRoute.imageUnpack.rawValue] = harness.unpack
-            routes[ImagesServiceXPCRoute.imageCleanupOrphanedBlobs.rawValue] = harness.cleanupOrphanedBlobs
+            routes[ImagesServiceXPCRoute.imageCleanupOrphanedBlobs.rawValue] = harness.cleanUpOrphanedBlobs
             routes[ImagesServiceXPCRoute.imageDiskUsage.rawValue] = harness.calculateDiskUsage
             routes[ImagesServiceXPCRoute.snapshotDelete.rawValue] = harness.deleteSnapshot
             routes[ImagesServiceXPCRoute.snapshotGet.rawValue] = harness.getSnapshot
diff --git a/Sources/Services/ContainerAPIService/Client/ClientImage.swift b/Sources/Services/ContainerAPIService/Client/ClientImage.swift
@@ -321,7 +321,7 @@ extension ClientImage {
         return ImageLoadResult(images: images, rejectedMembers: rejectedMembers)
     }
 
-    public static func cleanupOrphanedBlobs() async throws -> ([String], UInt64) {
+    public static func cleanUpOrphanedBlobs() async throws -> ([String], UInt64) {
         let client = newXPCClient()
         let request = newRequest(.imageCleanupOrphanedBlobs)
         let response = try await client.send(request)
diff --git a/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift b/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift
@@ -493,7 +493,7 @@ public actor ContainersService {
             let client = try state.getClient()
             try await client.stop(options: opts)
             try await self.lock.withLock { context in
-                try await self.cleanup(id: id, context: context)
+                try await self.cleanUp(id: id, context: context)
             }
         case .stopping:
             throw ContainerizationError(
@@ -502,7 +502,7 @@ public actor ContainersService {
             )
         default:
             try await self.lock.withLock { context in
-                try await self.cleanup(id: id, context: context)
+                try await self.cleanUp(id: id, context: context)
             }
         }
     }
@@ -578,15 +578,15 @@ public actor ContainersService {
 
         let options = try getContainerCreationOptions(id: id)
         if options.autoRemove {
-            try await self.cleanup(id: id, context: context)
+            try await self.cleanUp(id: id, context: context)
         }
     }
 
     private static func fullLaunchdServiceLabel(runtimeName: String, instanceId: String) -> String {
         "\(Self.launchdDomainString)/\(Self.machServicePrefix).\(runtimeName).\(instanceId)"
     }
 
-    private func _cleanup(id: String) async throws {
+    private func _cleanUp(id: String) async throws {
         self.log.debug("\(#function)")
 
         // Did the exit container handler win?
@@ -611,8 +611,8 @@ public actor ContainersService {
         self.containers.removeValue(forKey: id)
     }
 
-    private func cleanup(id: String, context: AsyncLock.Context) async throws {
-        try await self._cleanup(id: id)
+    private func cleanUp(id: String, context: AsyncLock.Context) async throws {
+        try await self._cleanUp(id: id)
     }
 
     private func getContainerCreationOptions(id: String) throws -> ContainerCreateOptions {
diff --git a/Sources/Services/ContainerImagesService/Server/ImageService.swift b/Sources/Services/ContainerImagesService/Server/ImageService.swift
@@ -128,10 +128,10 @@ public actor ImagesService {
         return (images, rejectedMembers)
     }
 
-    public func cleanupOrphanedBlobs() async throws -> ([String], UInt64) {
+    public func cleanUpOrphanedBlobs() async throws -> ([String], UInt64) {
         let images = try await self._list()
         let freedSnapshotBytes = try await self.snapshotStore.clean(keepingSnapshotsFor: images)
-        let (deleted, freedContentBytes) = try await self.imageStore.cleanupOrphanedBlobs()
+        let (deleted, freedContentBytes) = try await self.imageStore.cleanUpOrphanedBlobs()
         return (deleted, freedContentBytes + freedSnapshotBytes)
     }
 
@@ -223,9 +223,9 @@ extension ImagesService {
         if let authentication {
             return try await body(authentication)
         }
-        let keychain = KeychainHelper(id: Constants.keychainID)
+        let keychain = KeychainHelper(securityDomain: Constants.keychainID)
         do {
-            authentication = try keychain.lookup(domain: host)
+            authentication = try keychain.lookup(hostname: host)
         } catch let err as KeychainHelper.Error {
             guard case .keyNotFound = err else {
                 throw ContainerizationError(.internalError, message: "error querying keychain for \(host)", cause: err)
diff --git a/Sources/Services/ContainerImagesService/Server/ImagesServiceHarness.swift b/Sources/Services/ContainerImagesService/Server/ImagesServiceHarness.swift
@@ -182,8 +182,8 @@ public struct ImagesServiceHarness: Sendable {
     }
 
     @Sendable
-    public func cleanupOrphanedBlobs(_ message: XPCMessage) async throws -> XPCMessage {
-        let (deleted, size) = try await service.cleanupOrphanedBlobs()
+    public func cleanUpOrphanedBlobs(_ message: XPCMessage) async throws -> XPCMessage {
+        let (deleted, size) = try await service.cleanUpOrphanedBlobs()
         let reply = message.reply()
         let data = try JSONEncoder().encode(deleted)
         reply.set(key: .digests, value: data)
diff --git a/Sources/Services/ContainerSandboxService/Server/SandboxService.swift b/Sources/Services/ContainerSandboxService/Server/SandboxService.swift
@@ -223,10 +223,10 @@ public actor SandboxService {
                 await self.setState(.booted)
             } catch {
                 do {
-                    try await self.cleanupContainer(containerInfo: ctrInfo)
+                    try await self.cleanUpContainer(containerInfo: ctrInfo)
                     await self.setState(.created)
                 } catch {
-                    self.log.error("failed to cleanup container: \(error)")
+                    self.log.error("Failed to clean up container: \(error)")
                 }
                 throw error
             }
@@ -443,9 +443,9 @@ public actor SandboxService {
                     if case .stopped(_) = await self.state {
                         return message.reply()
                     }
-                    try await self.cleanupContainer(containerInfo: ctr, exitStatus: exitStatus)
+                    try await self.cleanUpContainer(containerInfo: ctr, exitStatus: exitStatus)
                 } catch {
-                    self.log.error("failed to cleanup container: \(error)")
+                    self.log.error("Failed to clean up container: \(error)")
                 }
                 await self.setState(.stopped(exitStatus.exitCode))
             default:
@@ -668,7 +668,7 @@ public actor SandboxService {
             }
             try await self.monitor.track(id: id, waitingOn: waitFunc)
         } catch {
-            try? await self.cleanupContainer(containerInfo: info)
+            try? await self.cleanUpContainer(containerInfo: info)
             self.setState(.created)
             throw error
         }
@@ -796,9 +796,9 @@ public actor SandboxService {
             }
 
             do {
-                try await cleanupContainer(containerInfo: ctrInfo, exitStatus: exitStatus)
+                try await cleanUpContainer(containerInfo: ctrInfo, exitStatus: exitStatus)
             } catch {
-                self.log.error("failed to cleanup container: \(error)")
+                self.log.error("Failed to clean up container: \(error)")
             }
             await setState(.stopped(exitStatus.exitCode))
         }
@@ -1025,7 +1025,7 @@ public actor SandboxService {
         return code
     }
 
-    private func cleanupContainer(containerInfo: ContainerInfo, exitStatus: ExitStatus? = nil) async throws {
+    private func cleanUpContainer(containerInfo: ContainerInfo, exitStatus: ExitStatus? = nil) async throws {
         let container = containerInfo.container
         let id = container.id
 
diff --git a/Tests/CLITests/Subcommands/Build/CLIBuilderTest.swift b/Tests/CLITests/Subcommands/Build/CLIBuilderTest.swift
@@ -697,5 +697,25 @@ extension TestCLIBuildBase {
             try self.build(tag: imageName, tempDir: tempDir)
             #expect(try self.inspectImage(imageName) == imageName, "expected to have successfully built \(imageName)")
         }
+
+        @Test func testBuildNoCachePullLatestImage() throws {
+            let tempDir: URL = try createTempDir()
+            let dockerfile =
+                """
+                FROM \(alpine)
+
+                ADD emptyFile /
+                """
+            let context: [FileSystemEntry] = [.file("emptyFile", content: .zeroFilled(size: 1))]
+            try createContext(tempDir: tempDir, dockerfile: dockerfile, context: context)
+
+            let imageName = "registry.local/no-cache-pull:\(UUID().uuidString)"
+            try self.build(
+                tags: [imageName],
+                tempDir: tempDir,
+                otherArgs: ["--pull", "--no-cache"]
+            )
+            #expect(try self.inspectImage(imageName) == imageName, "expected to have successfully built \(imageName)")
+        }
     }
 }
diff --git a/Tests/CLITests/Subcommands/Volumes/TestCLIAnonymousVolumes.swift b/Tests/CLITests/Subcommands/Volumes/TestCLIAnonymousVolumes.swift
@@ -24,10 +24,10 @@ class TestCLIAnonymousVolumes: CLITest {
     override init() throws {
         try super.init()
         // Clean up any leftover resources from previous test runs
-        cleanupAllTestResources()
+        cleanUpAllTestResources()
     }
 
-    private func cleanupAllTestResources() {
+    private func cleanUpAllTestResources() {
         // Clean up test containers (force remove)
         if let (_, output, _, status) = try? run(arguments: ["ls", "-a"]), status == 0 {
             let containers = output.components(separatedBy: .newlines)
@@ -185,7 +185,7 @@ class TestCLIAnonymousVolumes: CLITest {
         output = output.trimmingCharacters(in: .whitespacesAndNewlines)
         #expect(output == testData, "data should persist in anonymous volume")
 
-        // Cleanup
+        // Clean up
         try doStop(name: containerName2)
         doRemoveIfExists(name: containerName2, force: true)
         doVolumeDeleteIfExists(name: volumeID)
diff --git a/Tests/CLITests/Subcommands/Volumes/TestCLIVolumes.swift b/Tests/CLITests/Subcommands/Volumes/TestCLIVolumes.swift
diff --git a/docs/command-reference.md b/docs/command-reference.md

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public actor BuildPipeline {`
`30`	`30`	`[`
`31`	`31`	`try BuildFSSync(URL(filePath: config.contextDir)),`
`32`	`32`	`try BuildRemoteContentProxy(config.contentStore),`
`33`		`- try BuildImageResolver(config.contentStore, quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError),`
	`33`	`+ try BuildImageResolver(config.contentStore, quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError, pull: config.pull),`
`34`	`34`	`try BuildStdio(quiet: config.quiet, output: config.terminal?.handle ?? FileHandle.standardError),`
`35`	`35`	`]`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ extension Application {`
`69`	`69`	`failures.append(image.reference)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`- let (_, size) = try await ClientImage.cleanupOrphanedBlobs()`
	`72`	`+ let (_, size) = try await ClientImage.cleanUpOrphanedBlobs()`
`73`	`73`	`let formatter = ByteCountFormatter()`
`74`	`74`	`let freed = formatter.string(fromByteCount: Int64(size))`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ extension Application {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- let (deletedDigests, size) = try await ClientImage.cleanupOrphanedBlobs()`
	`68`	`+ let (deletedDigests, size) = try await ClientImage.cleanUpOrphanedBlobs()`
`69`	`69`
`70`	`70`	`for image in imagesToPrune {`
`71`	`71`	`print("untagged \(image.reference)")`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ extension Application {`
`56`	`56`	`}`
`57`	`57`	`password = String(decoding: passwordData, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)`
`58`	`58`	`}`
`59`		`- let keychain = KeychainHelper(id: Constants.keychainID)`
	`59`	`+ let keychain = KeychainHelper(securityDomain: Constants.keychainID)`
`60`	`60`	`if username == "" {`
`61`		`- username = try keychain.userPrompt(domain: server)`
	`61`	`+ username = try keychain.userPrompt(hostname: server)`
`62`	`62`	`}`
`63`	`63`	`if password == "" {`
`64`	`64`	`password = try keychain.passwordPrompt()`
`@@ -89,7 +89,7 @@ extension Application {`
`89`	`89`	`)`
`90`	`90`	`)`
`91`	`91`	`try await client.ping()`
`92`		`- try keychain.save(domain: server, username: username, password: password)`
	`92`	`+ try keychain.save(hostname: server, username: username, password: password)`
`93`	`93`	`print("Login succeeded")`
`94`	`94`	`}`
`95`	`95`	`}`