Skip to content

Commit 6690f6d

Browse files
authored
Corrections and refinements for user documentation. (apple#35)
1 parent 7020082 commit 6690f6d

6 files changed

Lines changed: 48 additions & 47 deletions

File tree

BUILDING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Building the project
22

3-
To build the Containerization package, your system needs either:
3+
To build the `container` project, your system needs either:
44

5-
- macOS 15 or newer and Xcode 17 beta.
6-
- macOS 16 Developer Preview.
5+
- macOS Sequoia 15 or newer and Xcode 17 beta.
6+
- macOS Developer Preview.
77

88
## Compile and test
99

@@ -39,7 +39,7 @@ To make changes to `container` that require changes to the Containerization proj
3939
cd container
4040
```
4141
42-
3. If the application services are already running, stop them.
42+
3. If the `container` services are already running, stop them.
4343
4444
```
4545
bin/container system stop
@@ -52,10 +52,10 @@ To make changes to `container` that require changes to the Containerization proj
5252
swift package update containerization
5353
```
5454
55-
5. Build the init filesystem for your local copy of containerization.
55+
5. Build the init filesystem for your local copy of the Containerization project.
5656
5757
```
58-
(cd ../swiftcontainerization && make clean all)
58+
(cd ${CONTAINERIZATION_PATH} && make clean all)
5959
```
6060
6161
6. Build `container`.
@@ -64,7 +64,7 @@ To make changes to `container` that require changes to the Containerization proj
6464
make clean all
6565
```
6666
67-
7. Start the application services.
67+
7. Start the `container` services.
6868
6969
```
7070
bin/container system start
@@ -85,7 +85,7 @@ To revert to using the Containerization dependency from your `Package.swift`:
8585
make clean all
8686
```
8787
88-
3. Restart application services.
88+
3. Restart the `container` services.
8989
9090
```
9191
bin/container system restart

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11

22
# `container`
33

4-
`container` is an application that you can use to create and run Linux containers as lightweight virtual machines on your Mac. It's written in Swift, and optimized for Apple silicon.
4+
`container` is a tool that you can use to create and run Linux containers as lightweight virtual machines on your Mac. It's written in Swift, and optimized for Apple silicon.
55

6-
The application consumes and produces OCI-compliant container images, so you can pull and run images from any standard container registry. You can push images that you build to those registries as well, and run the images in any other OCI-compliant application.
6+
The tool consumes and produces OCI-compliant container images, so you can pull and run images from any standard container registry. You can push images that you build to those registries as well, and run the images in any other OCI-compliant application.
77

8-
`container` uses the [Containerization](https://github.com/apple/containerization) Swift package for low level container, image and process management.
8+
`container` uses the [Containerization](https://github.com/apple/containerization) Swift package for low level container, image, and process management.
99

1010
![introductory movie showing some basic commands](./docs/assets/landing-movie.gif)
1111

1212
## Get started
1313

14-
Install the `container` application on your Mac.
14+
Install `container` on your Mac.
1515

1616
### Requirements
1717

18-
You need an Apple silicon Mac to run `container`. To build the application, see the [BUILDING](./BUILDING.md) document.
18+
You need an Apple silicon Mac to run `container`. To build it, see the [BUILDING](./BUILDING.md) document.
1919

20-
`container` is designed to take advantage of the features of the macOS 16 Developer Preview. You can run the application on macOS Sequoia, but the `container` maintainers typically will not address Sequoia issues that cannot be reproduced on the macOS 16 Developer Preview.
20+
`container` is designed to use the new features in the macOS Developer Preview. You can run the tool on macOS Sequoia 15, but the `container` maintainers typically will not address issues discovered on macOS Sequoia 15 that cannot be reproduced on the macOS Developer Preview.
2121

22-
There are [significant networking limitations](https://github.com/apple/container#macos-sequoia-limitations) that impact the usability `container` on macOS Sequoia.
22+
There are [significant networking limitations](/docs/technical-overview.md#macos-sequoia-15-limitations) that impact the usability `container` on macOS Sequoia 15.
2323

2424
### Install or upgrade
2525

@@ -29,13 +29,13 @@ If you're upgrading, first uninstall your existing `container` while preserving
2929
uninstall-container.sh -k
3030
```
3131

32-
Download the latest application installer package from the [Github release page](https://github.com/apple/container/releases).
32+
Download the latest installer package for `container` from the [Github release page](https://github.com/apple/container/releases).
3333

34-
To install the application, double click the package file and follow the instructions. Enter your administrator password when prompted to give the installer permission to place the application under `/usr/local`.
34+
To install the tool, double click the package file and follow the instructions. Enter your administrator password when prompted, to give the installer permission to place the installed files under `/usr/local`.
3535

3636
### Uninstall
3737

38-
Use the `uninstall-container.sh` script to remove the application from your system. To remove your user data along with the application, run:
38+
Use the `uninstall-container.sh` script to remove `container` from your system. To remove your user data along with the tool, run:
3939

4040
```bash
4141
uninstall-container.sh -d
@@ -52,8 +52,8 @@ uninstall-container.sh -k
5252
- Take [a guided tour of `container`](./docs/tutorial.md) by building, running, and publishing a simple web server image.
5353
- Learn how to [use various `container` features](./docs/how-to.md).
5454
- Read a brief description and [technical overview](./docs/technical-overview.md) of `container`.
55+
- View the project [API documentation](https://pages.github.com/apple/container/).
5556

5657
## Contributing
5758

58-
Contributions to Containerization are welcomed and encouraged. Please see our [main contributing guide](https://github.com/apple/containerization/blob/main/CONTRIBUTING.md) for more information.
59-
59+
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.

docs/how-to.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ How to use the features of `container`.
44

55
## Configure memory and CPUs for your containers
66

7-
Since the containers created by `container` are lightweight virtual machines, you need to consider the needs of your containerized application when you `container run` a container. The `--memory` and `--cpus` options allow you to override the default memory and CPU limits for the virtual machine. The default values are 1 gigabyte of RAM and 4 CPUs. You can use abbreviations for memory units; for example, to run a container for image `big` with 8 CPUs and 32 gigabytes of memory, use:
7+
Since the containers created by `container` are lightweight virtual machines, consider the needs of your containerized application when you use `container run`. The `--memory` and `--cpus` options allow you to override the default memory and CPU limits for the virtual machine. The default values are 1 gigabyte of RAM and 4 CPUs. You can use abbreviations for memory units; for example, to run a container for image `big` with 8 CPUs and 32 gigabytes of memory, use:
88

99
```bash
1010
container run --rm --cpus 8 --memory 32g big
1111
```
1212

1313
## Configure memory and CPUs for large builds
1414

15-
When you first run `container build`, `container` starts a *builder*, which is a utility container that performs image build. As with anything you run with `container run`, the builder runs in a lightweight virtual machine, so for resource-intensive builds, you may need to increase the memory and CPU limits for the builder VM.
15+
When you first run `container build`, `container` starts a *builder*, which is a utility container that builds images from your `Dockerfile`s. As with anything you run with `container run`, the builder runs in a lightweight virtual machine, so for resource-intensive builds, you may need to increase the memory and CPU limits for the builder VM.
1616

1717
By default, the builder VM receives 2 gigabytes of RAM and 2 CPUs. You can change these limits by starting the builder container before running `container build`:
1818

@@ -46,7 +46,7 @@ total 4
4646

4747
The argument to `--volume` in the example consists of the full pathname for the host folder and the full pathname for the mount point in the container, separated by a colon.
4848

49-
The `--mount` option uses a comma separated `key=value` syntax to achieve the same result:
49+
The `--mount` option uses a comma-separated `key=value` syntax to achieve the same result:
5050

5151
```shellsession
5252
% container run --mount source=${HOME}/Desktop/assets,target=/content/assets docker.io/python:slim ls -l /content/assets
@@ -57,9 +57,9 @@ total 4
5757

5858
## Build and run a multiplatform image
5959

60-
Using the [project from the tutorial example](/documentation/tutorial/#set-up-a-simple-project), you can create an image to use both on Apple Silicon Macs and on AMD64 servers.
60+
Using the [project from the tutorial example](/documentation/tutorial/#set-up-a-simple-project), you can create an image to use both on Apple silicon Macs and on x86-64 servers.
6161

62-
When building the image, just add `--arch` options that directs the builder to create an image supporting both the `arm64` and `amd64` architectures:
62+
When building the image, just add `--arch` options that direct the builder to create an image supporting both the `arm64` and `amd64` architectures:
6363

6464
```bash
6565
container build --arch arm64 --arch amd64 --tag registry.example.com/fido/web-test:latest --file Dockerfile .
@@ -73,7 +73,7 @@ Linux 7932ce5f-ec10-4fbe-a2dc-f29129a86b64 6.1.68 #1 SMP Mon Mar 31 18:27:51 UTC
7373
%
7474
```
7575

76-
When you run the command with the `amd64` architecture, the AMD64 version of `uname` of Python using Rosetta translation, so that you will see information for an AMD64 system:
76+
When you run the command with the `amd64` architecture, the x86-64 version of `uname` runs under Rosetta translation, so that you will see information for an x86-64 system:
7777

7878
```shellsession
7979
container run --arch amd64 --rm registry.example.com/fido/web-test:latest uname -a

0 commit comments

Comments
 (0)