From ffc11955562473fc02dfee040efa122e0ab5cac6 Mon Sep 17 00:00:00 2001 From: J Logan Date: Wed, 1 Oct 2025 15:27:35 -0700 Subject: [PATCH] Remove references to macOS 26 beta. (#702) ## Type of Change - [ ] Bug fix - [ ] New feature - [ ] Breaking change - [x] Documentation update --- BUILDING.md | 6 +++--- README.md | 2 +- Sources/ContainerClient/Parser.swift | 2 +- docs/technical-overview.md | 4 ++-- docs/tutorial.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index e3838ac0..b90a35a2 100644 --- a/BUILDING.md +++ b/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 diff --git a/README.md b/README.md index 6652a257..d30df676 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/Sources/ContainerClient/Parser.swift b/Sources/ContainerClient/Parser.swift index 24f84493..aaeda13f 100644 --- a/Sources/ContainerClient/Parser.swift +++ b/Sources/ContainerClient/Parser.swift @@ -118,7 +118,7 @@ public struct Parser { continue } if !line.hasPrefix("#") { - let keyVals = line.split(separator: "=") + let keyVals = line.split(separator: "=", maxSplits: 2) if keyVals.count != 2 { continue } diff --git a/docs/technical-overview.md b/docs/technical-overview.md index 83962af0..02d62d89 100644 --- a/docs/technical-overview.md +++ b/docs/technical-overview.md @@ -16,7 +16,7 @@ None of this workflow would be practical without ensuring interoperability betwe ## How does `container` run my container? -Many operating systems support containers, but the most commonly encountered containers are those that run on the Linux operating system. On macOS, the typical way to run Linux containers is to launch a Linux virtual machine (VM) that hosts all of your containers. +Many operating systems support containers, but the most commonly encountered containers are those that run on the Linux operating system. With macOS, the typical way to run Linux containers is to launch a Linux virtual machine (VM) that hosts all of your containers. `container` runs containers differently. Using the open source [Containerization](https://github.com/apple/containerization) package, it runs a lightweight VM for each container that you create. This approach has the following properties: @@ -67,7 +67,7 @@ Currently, memory pages freed to the Linux operating system by processes running ### macOS 15 limitations -`container` relies on the new features and enhancements present in the macOS 26 beta. You can run `container` on macOS 15, but you will need to be aware of some user experience and functional limitations. There is no plan to address issues found with macOS 15 that cannot be reproduced in the macOS 26 beta. +`container` relies on the new features and enhancements present in macOS 26. You can run `container` on macOS 15, but you will need to be aware of some user experience and functional limitations. There is no plan to address issues found with macOS 15 that cannot be reproduced on macOS 26. #### Network isolation diff --git a/docs/tutorial.md b/docs/tutorial.md index a7f3ee31..fc83b3ad 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -225,7 +225,7 @@ You will often see these two options abbreviated and specified together as `-ti` Your web server is accessible from other containers as well as from your host. Launch a second container using your `web-test` image, and this time, specify a `curl` command to retrieve the `index.html` content from the first container. > [!NOTE] -> Container relies on the new features and enhancements present in the macOS 26 beta. +> Container relies on the new features and enhancements present in macOS 26. > As a result, the functionality of accessing the web server from another container will not work on macOS 15. > See https://github.com/apple/container/blob/main/docs/technical-overview.md#macos-15-limitations for more details.