Merge branch 'apple:main' into main

Author: Mcrich23

.github/ISSUE_TEMPLATE/01-bug.yml

@@ -43,8 +43,8 @@ body:
       label: Environment 
       description: |
         Examples: 
-          - **OS**: macOS 26.0 Beta (25A5279m)
-          - **Xcode**: Version 26.0 beta (17A5241e)
+          - **OS**: macOS 26.0 (25A354)
+          - **Xcode**: Version 26.0 (17A324)
           - **Container**: Container CLI version 0.1.0
       value: |
         - OS: 
@@ -58,6 +58,8 @@ body:
     attributes:
       label: Relevant log output
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      value: |
+        N/A
       render: shell
   - type: checkboxes
     id: terms

BUILDING.md

@@ -3,11 +3,11 @@
 To build the `container` project, you need:
 
 - Mac with Apple silicon
-- macOS 15 minimum, macOS 26 beta recommended
-- Xcode 26 beta, set as the [active developer directory](https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-HOW_DO_I_SELECT_THE_DEFAULT_VERSION_OF_XCODE_TO_USE_FOR_MY_COMMAND_LINE_TOOLS_)
+- macOS 15 minimum, macOS 26 recommended
+- Xcode 26, set as the [active developer directory](https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-HOW_DO_I_SELECT_THE_DEFAULT_VERSION_OF_XCODE_TO_USE_FOR_MY_COMMAND_LINE_TOOLS_)
 
 > [!IMPORTANT]
-> There is a bug in the `vmnet` framework on macOS 26 beta that causes network creation to fail if the `container` helper applications are located under your `Documents` or `Desktop` directories. If you use `make install`, you can simply run the `container` binary in `/usr/local`. If you prefer to use the binaries that `make all` creates in your project `bin` and `libexec` directories, locate your project elsewhere, such as `~/projects/container`, until this issue is resolved.
+> There is a bug in the `vmnet` framework on macOS 26 that causes network creation to fail if the `container` helper applications are located under your `Documents` or `Desktop` directories. If you use `make install`, you can simply run the `container` binary in `/usr/local`. If you prefer to use the binaries that `make all` creates in your project `bin` and `libexec` directories, locate your project elsewhere, such as `~/projects/container`, until this issue is resolved.
 
 ## Compile and test
 

Makefile

@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+# Copyright © 2025 Apple Inc. and the container project authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Package.resolved

@@ -1,6 +1,6 @@
 // swift-tools-version: 6.2
 //===----------------------------------------------------------------------===//
-// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+// Copyright © 2025 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -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.6.1"
-let scVersion = "0.7.2"
+let scVersion = "0.9.1"
 
 let package = Package(
     name: "container",
@@ -42,18 +42,11 @@ let package = Package(
         .library(name: "ContainerVersion", targets: ["ContainerVersion"]),
         .library(name: "ContainerXPC", targets: ["ContainerXPC"]),
         .library(name: "SocketForwarder", targets: ["SocketForwarder"]),
-        .library(name: "ContainerBuildReporting", targets: ["ContainerBuildReporting"]),
-        .library(name: "ContainerBuildIR", targets: ["ContainerBuildIR"]),
-        .library(name: "ContainerBuildExecutor", targets: ["ContainerBuildExecutor"]),
-        .library(name: "ContainerBuildCache", targets: ["ContainerBuildCache"]),
-        .library(name: "ContainerBuildSnapshotter", targets: ["ContainerBuildSnapshotter"]),
-        .library(name: "ContainerBuildParser", targets: ["ContainerBuildParser"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.2.0"),
-        .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
         .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.26.0"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.29.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.80.0"),
@@ -71,7 +64,7 @@ let package = Package(
                 "ContainerClient",
                 "ContainerCommands",
             ],
-            path: "Sources/ExecutableCLI"
+            path: "Sources/CLI"
         ),
         .target(
             name: "ContainerCommands",
@@ -90,7 +83,7 @@ let package = Package(
                 "ContainerVersion",
                 "TerminalProgress",
             ],
-            path: "Sources/CLI"
+            path: "Sources/ContainerCommands"
         ),
         .executableTarget(
             name: "container-apiserver",
@@ -276,77 +269,6 @@ let package = Package(
                 "ContainerPersistence",
             ]
         ),
-        .executableTarget(
-            name: "native-builder-demo",
-            dependencies: ["ContainerBuildIR", "ContainerBuildExecutor", "ContainerBuildCache"],
-            path: "Sources/NativeBuilder/ContainerBuildDemo"
-        ),
-        .target(
-            name: "ContainerBuildReporting",
-            dependencies: [],
-            path: "Sources/NativeBuilder/ContainerBuildReporting",
-        ),
-        .target(
-            name: "ContainerBuildIR",
-            dependencies: [
-                "ContainerBuildReporting",
-                .product(name: "ContainerizationOCI", package: "containerization"),
-                .product(name: "Crypto", package: "swift-crypto"),
-            ],
-            path: "Sources/NativeBuilder/ContainerBuildIR",
-        ),
-        .target(
-            name: "ContainerBuildExecutor",
-            dependencies: [
-                "ContainerBuildReporting",
-                "ContainerBuildIR",
-                "ContainerBuildSnapshotter",
-                "ContainerBuildCache",
-                .product(name: "ContainerizationOCI", package: "containerization"),
-            ],
-            path: "Sources/NativeBuilder/ContainerBuildExecutor",
-        ),
-        .target(
-            name: "ContainerBuildCache",
-            dependencies: [
-                "ContainerBuildIR",
-                "ContainerBuildSnapshotter",
-                .product(name: "ContainerizationOCI", package: "containerization"),
-                .product(name: "ContainerizationExtras", package: "containerization"),
-                .product(name: "Crypto", package: "swift-crypto"),
-            ],
-            path: "Sources/NativeBuilder/ContainerBuildCache",
-        ),
-        .target(
-            name: "ContainerBuildSnapshotter",
-            dependencies: [
-                "ContainerBuildIR",
-                .product(name: "ContainerizationOCI", package: "containerization"),
-                .product(name: "ContainerizationArchive", package: "containerization"),
-                .product(name: "Crypto", package: "swift-crypto"),
-                "ContainerClient",
-            ],
-            path: "Sources/NativeBuilder/ContainerBuildSnapshotter",
-        ),
-        .target(
-            name: "ContainerBuildParser",
-            dependencies: [
-                "ContainerBuildIR"
-            ],
-            path: "Sources/NativeBuilder/ContainerBuildParser",
-        ),
-        .testTarget(
-            name: "NativeBuilderTests",
-            dependencies: [
-                "ContainerBuildIR",
-                "ContainerBuildExecutor",
-                "ContainerBuildCache",
-                "ContainerBuildReporting",
-                "ContainerBuildParser",
-                "ContainerBuildSnapshotter",
-                "ContainerClient",
-            ]
-        ),
         .target(
             name: "ContainerPersistence",
             dependencies: [

Package.swift

@@ -1,4 +1,4 @@
-# Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+# Copyright © 2025 Apple Inc. and the container project authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Protobuf.Makefile

@@ -14,7 +14,7 @@ The tool consumes and produces [OCI-compatible container images](https://github.
 
 You need a Mac with Apple silicon to run `container`. To build it, see the [BUILDING](./BUILDING.md) document.
 
-`container` is supported on macOS 26, since it takes advantage of new features and enhancements to virtualization and networking in this release. We do not support older versions of macOS and the `container` maintainers typically will not address issues that cannot be reproduced on the latest macOS 26 beta.
+`container` is supported on macOS 26, since it takes advantage of new features and enhancements to virtualization and networking in this release. We do not support older versions of macOS and the `container` maintainers typically will not address issues that cannot be reproduced on the macOS 26.
 
 ### Install or upgrade
 
@@ -58,6 +58,11 @@ uninstall-container.sh -k
 - [Build and run](./BUILDING.md) `container` on your own development system.
 - View the project [API documentation](https://apple.github.io/container/documentation/).
 
+> [!IMPORTANT]
+> The links above are for the CURRENT BRANCH's documentation. To find documentation for official releases, find the target release on the [Release Page](https://github.com/apple/container/releases) and click the tag corresponding to your release version. 
+>
+> Example: [release 0.4.1 tag](https://github.com/apple/container/tree/0.4.1)
+
 ## Contributing
 
 Contributions to `container` are welcomed and encouraged. Please see our [main contributing guide](https://github.com/apple/containerization/blob/main/CONTRIBUTING.md) for more information.

README.md

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+// Copyright © 2025 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import ContainerClient
 import ContainerCommands
 
 @main
-public struct Executable: AsyncParsableCommand {
+public struct ContainerCLI: AsyncParsableCommand {
     public init() {}
 
     @Argument(parsing: .captureForPassthrough)