Skip to content

Commit 1505523

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents fe05ca2 + 6f7fdc7 commit 1505523

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1165
-864
lines changed

.wordlist.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4448,4 +4448,10 @@ wlan
44484448
wlp
44494449
wlx
44504450
xquartz
4451-
zenohd
4451+
zenohd
4452+
Kompanio
4453+
Zenoh's
4454+
instrumentable
4455+
subprocesses
4456+
CPzfYHdpQ
4457+
iso

content/install-guides/aperf.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,26 @@ Visit the [releases page](https://github.com/aws/aperf/releases/) to see a list
5050
You can also download a release from the command line:
5151

5252
```bash { target="ubuntu:latest" }
53-
wget https://github.com/aws/aperf/releases/download/v0.1.12-alpha/aperf-v0.1.12-alpha-aarch64.tar.gz
53+
wget https://github.com/aws/aperf/releases/download/v0.1.15-alpha/aperf-v0.1.15-alpha-aarch64.tar.gz
5454
```
5555

5656
Extract the release:
5757

5858
```bash { target="ubuntu:latest" }
59-
tar xvfz aperf-v0.1.12-alpha-aarch64.tar.gz
59+
tar xvfz aperf-v0.1.15-alpha-aarch64.tar.gz
6060
```
6161

6262
Add the path to `aperf` in your `.bashrc` file.
6363

6464
```console
65-
echo 'export PATH="$PATH:$HOME/aperf-v0.1.12-alpha-aarch64"' >> ~/.bashrc
65+
echo 'export PATH="$PATH:$HOME/aperf-v0.1.15-alpha-aarch64"' >> ~/.bashrc
6666
source ~/.bashrc
6767
```
6868

6969
Alternatively, you can copy the `aperf` executable to a directory already in your search path.
7070

7171
```bash { target="ubuntu:latest" }
72-
sudo cp aperf-v0.1.12-alpha-aarch64/aperf /usr/local/bin
72+
sudo cp aperf-v0.1.15-alpha-aarch64/aperf /usr/local/bin
7373
```
7474

7575
Confirm `aperf` is installed by printing the version:
Lines changed: 49 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,43 @@
11
---
22
title: Container CLI for macOS
3-
4-
draft: true
5-
63
author: Rani Chowdary Mandepudi
7-
84
minutes_to_complete: 10
9-
105
official_docs: https://github.com/apple/container
11-
126
additional_search_terms:
13-
- container
14-
- virtualization
15-
7+
- container
8+
- virtualization
169
layout: installtoolsall
1710
multi_install: false
1811
multitool_install_part: false
1912
test_maintenance: false
13+
tool_install: true
2014
weight: 1
2115
---
2216

23-
Container CLI is an open-source command line tool from Apple for building and running Arm Linux containers directly on macOS using lightweight virtual machines, without the need for Docker Desktop or Linux VMs.
17+
Container CLI is an open-source command-line tool from Apple for building and running Arm Linux containers directly on macOS using lightweight virtual machines without Docker Desktop or full Linux VMs.
2418

2519
It supports the full OCI (Open Container Initiative) workflow: building, running, tagging, and pushing container images.
2620

2721
## What should I do before installing the Container CLI?
2822

29-
This article provides a step-by-step guide to install and use the `container` command-line tool for building and running Arm Linux containers natively on macOS systems with Apple silicon.
23+
This guide shows how to install and use the `container` CLI to run Arm Linux containers natively on Apple silicon Macs.
3024

31-
Confirm you are using an Apple silicon Mac by running:
25+
First, confirm you are using an Apple silicon Mac by running:
3226

3327
```bash
3428
uname -m
3529
```
3630

37-
The output on macOS is:
31+
Expected output:
3832

3933
```output
4034
arm64
4135
```
36+
{{% notice Note %}}
37+
Container CLI supports only Apple silicon Macs (M1, M2, M3, and M4).
38+
{{% /notice %}}
4239

43-
Container CLI only works on Macs with Apple silicon, including M1, M2, M3, and M4.
44-
45-
Use the following command to verify macOS version:
40+
Check your macOS version:
4641

4742
```bash
4843
sw_vers -productVersion
@@ -54,37 +49,35 @@ Example output:
5449
15.5
5550
```
5651

57-
Your computer must be running macOS 15.0 or later to use the Container CLI.
52+
You must be running macOS 15.0 or later to use the Container CLI.
5853

5954
## How do I install Container CLI?
6055

61-
To install Container CLI on macOS, follow the steps below:
56+
To install Container CLI:
6257

63-
From the [official GitHub Release page](https://github.com/apple/container/releases), download the latest signed `.pkg` installer.
58+
Go to the [GitHub Releases page](https://github.com/apple/container/releases) and download the latest signed `.pkg` installer.
6459

6560
For example:
6661

6762
```bash
6863
wget https://github.com/apple/container/releases/download/0.2.0/container-0.2.0-installer-signed.pkg
6964
```
7065

71-
Install the downloaded package using:
66+
Install the package:
7267

7368
```bash
7469
sudo installer -pkg container-0.2.0-installer-signed.pkg -target /
7570
```
7671

77-
This installs the Container binary at `/usr/local/bin/container`
72+
This installs the Container binary at `/usr/local/bin/container`.
7873

79-
After installation, start the container system service by running the following command:
74+
Start the container system service:
8075

8176
```bash
8277
container system start
8378
```
8479

85-
{{% notice Note %}}
86-
The system service must be running to use container operations such as build, run, or push. It may also need to be started again after a reboot, depending on system settings.
87-
{{% /notice %}}
80+
You must start the service to use commands like `build`, `run`, or `push`. It may need to be restarted after rebooting.
8881

8982
The background server process is now running.
9083

@@ -97,119 +90,109 @@ container --version
9790
Example output:
9891

9992
```output
100-
container CLI version 0.2.0
93+
container CLI version 0.2.0
10194
```
10295

103-
This confirms that the Container CLI is successfully installed and ready to use.
104-
105-
## How do I build, run, and push a container using the Container CLI?
106-
107-
### Create a Dockerfile
96+
## Build and run a container
10897

109-
You can define a simple image that prints the system architecture.
11098

111-
Use an editor to create a file named `Dockerfile` with the following contents:
99+
In a working directory, create a file named `Dockerfile`:
112100

113-
```bash
101+
```dockerfile
114102
FROM ubuntu:latest
115103
CMD echo -n "Architecture is " && uname -m
116104
```
117105

118-
### Build the container image
106+
This image prints the system architecture when executed.
119107

120-
Build the image from the `Dockerfile`.
108+
### Build the image
121109

122-
This will pull the Ubuntu base image and tag the result as `uname`.
110+
Run the following to build and tag the container image as `uname`:
123111

124112
```bash
125113
container build -t uname .
126114
```
127115

128-
The output will be similar to:
116+
Example output:
129117

130118
```output
131119
Successfully built uname:latest
132120
```
133121

134-
### Run the container
122+
### Run the container
135123

136-
Execute the container to verify it runs successfully and prints the system architecture.
124+
Run the container to verify it prints the system architecture.
137125

138-
```bash
126+
```bash
139127
container run --rm uname
140128
```
141129

142-
The output is:
130+
Expected output:
143131

144132
```output
145133
Architecture is aarch64
146134
```
147135

148-
The `--rm` flag removes the container after it finishes.
136+
The `--rm` flag cleans up the container after it exits.
149137

150-
### Tag and push the image
138+
## Tag and push the image
151139

152140
Once the image is built and tested locally, it can be pushed to a container registry such as Docker Hub. This allows the image to be reused across machines or shared with others.
153141

154-
Use the `tag` command to apply a registry-compatible name to the image:
142+
Tag the image with a registry-compatible name:
155143

156-
```bash
144+
```bash
157145
container images tag uname docker.io/<your-username>/uname:latest
158146
```
159147

160148
Replace `<your-username>` with your Docker Hub username.
161149

162-
Before pushing the image, log in to Docker Hub:
150+
Log in to Docker Hub:
163151

164-
```bash
152+
```bash
165153
container registry login docker.io
166154
```
167155

168156
Enter your Docker Hub username and password.
169157

170-
{{% notice Note %}}
171158
The same command works with other registries such as GitHub Container Registry (ghcr.io) or any OCI-compliant registry. Replace `docker.io` with the appropriate registry hostname.
172-
{{% /notice %}}
173159

174-
Next, upload the tagged image to Docker Hub.
160+
Next, upload the tagged image to Docker Hub:
175161

176-
```bash
162+
```bash
177163
container images push docker.io/<your-username>/uname:latest
178164
```
179165

180-
Once the push completes successfully, the image will be available in the Docker Hub repository. It can be pulled and run on other systems that support the Arm architecture.
181-
182-
## How can I list images and containers?
166+
## List images and containers
183167

184-
You can view locally built or pulled images using:
168+
To view images:
185169

186-
```bash
170+
```bash
187171
container images ls
188172
```
189173

190-
To see running or previously executed containers:
174+
To view running or stopped containers:
191175

192176
```bash
193177
container ls
194178
```
195179

196180
## How do I uninstall the Container CLI?
197181

198-
The Container CLI includes an uninstall script that allows you to remove the tool from your system. You can choose to remove the CLI with or without user data.
182+
The CLI includes an uninstall script. You can choose whether to keep or delete your container data.
199183

200-
Uninstall and keep user data (images, containers):
184+
If you plan to reinstall later and want to keep your local container data. To uninstall and keep user data (images and containers):
201185

202-
```bash
186+
```bash
203187
uninstall-container.sh -k
204188
```
205189

206-
Use this if you plan to reinstall later and want to preserve your local container data.
207-
208-
Uninstall and delete all user data:
190+
Otherwise, to uninstall and delete all user data:
209191

210192
```bash
211193
uninstall-container.sh -d
212194
```
213-
This will permanently remove the CLI and all container images, logs, and metadata.
214195

215-
You can now build and run Arm Linux containers on macOS.
196+
This will remove the CLI and all related images, logs, and metadata.
197+
198+
You’ve now installed Container CLI and built your first Arm Linux container on macOS.

content/install-guides/go.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ The easiest way to install Go for Ubuntu on Arm is to download a release, extrac
4747
Download a Go release:
4848

4949
```bash { target="ubuntu:latest" }
50-
wget https://go.dev/dl/go1.23.1.linux-arm64.tar.gz
50+
wget https://go.dev/dl/go1.24.5.linux-arm64.tar.gz
5151
```
5252

5353
Extract the release to `/usr/local/go`:
5454

5555
```bash { target="ubuntu:latest" }
56-
sudo tar -C /usr/local -xzf ./go1.23.1.linux-arm64.tar.gz
56+
sudo tar -C /usr/local -xzf ./go1.24.5.linux-arm64.tar.gz
5757
```
5858

5959
Add the path to `go` in your `.bashrc` file.
@@ -74,7 +74,7 @@ go version
7474
The output should print the version:
7575

7676
```output
77-
go version go1.23.1 linux/arm64
77+
go version go1.24.5 linux/arm64
7878
```
7979

8080
You are ready to use the Go programming language on your Arm machine running Ubuntu.

content/install-guides/multipass.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ minutes_to_complete: 30
1919
author: Jason Andrews
2020

2121
### Link to official documentation
22-
official_docs: https://multipass.run/docs
22+
official_docs: https://documentation.ubuntu.com/multipass/en/latest/
2323

2424
test_images:
2525
- ubuntu:latest
@@ -53,15 +53,15 @@ Multipass uses the terms virtual machine and instance synonymously.
5353
Download Multipass for macOS.
5454

5555
```console
56-
wget https://github.com/canonical/multipass/releases/download/v1.14.1-rc1/multipass-1.14.1-rc1+mac.14+gf2381bfe9.mac-Darwin.pkg
56+
wget https://github.com/canonical/multipass/releases/download/v1.16.0/multipass-1.16.0+mac-Darwin.pkg
5757
```
5858

5959
### How do I install Multipass on macOS?
6060

6161
Install the download using the package command.
6262

6363
```console
64-
sudo installer -pkg multipass-1.14.1-rc1+mac.14+gf2381bfe9.mac-Darwin.pkg -target /
64+
sudo installer -pkg multipass-1.16.0+mac-Darwin.pkg -target /
6565
```
6666

6767
The getting started instructions below use the command line interface. If you prefer to use the graphical interface start it from the macOS Launchpad, the initial screen is shown below. You can use the UI to create, start, and stop virtual machines.
@@ -130,11 +130,7 @@ If you need to install `snapd` run:
130130
sudo apt install snapd -y
131131
```
132132

133-
LXD is also required for Multipass.
134133

135-
```bash
136-
sudo snap install lxd
137-
```
138134

139135
{{% notice Note %}}
140136
You can select from three Multipass releases: stable, beta, or edge. The default version is stable.

content/install-guides/nomachine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ Use a text editor to copy and paste this script into a file on the remote machin
6666
#!/bin/bash
6767
6868
# install NoMachine for remote desktop
69-
wget https://download.nomachine.com/download/8.4/Arm/nomachine_8.4.2_1_arm64.deb
70-
sudo dpkg -i nomachine_8.4.2_1_arm64.deb
69+
wget https://download.nomachine.com/download/9.0/Arm/nomachine_9.0.188_11_arm64.deb
70+
sudo dpkg -i nomachine_9.0.188_11_arm64.deb
7171
if [ $? != 0 ]; then
7272
exit 1
7373
fi

0 commit comments

Comments
 (0)