Skip to content

Commit 687b70d

Browse files
authored
Merge pull request #21729 from docker/published-update
publish updates from main
2 parents 7973cd3 + 7e1a59e commit 687b70d

File tree

12 files changed

+303
-244
lines changed

12 files changed

+303
-244
lines changed

_vale/Docker/Acronyms.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ exceptions:
1818
- BIOS
1919
- BPF
2020
- BSD
21+
- CFS
2122
- CI
23+
- CIDR
2224
- CISA
2325
- CLI
2426
- CNCF
2527
- CORS
2628
- CPU
2729
- CSS
2830
- CSV
31+
- CUDA
2932
- CVE
3033
- DCT
3134
- DEBUG
@@ -60,6 +63,8 @@ exceptions:
6063
- ID
6164
- IDE
6265
- IP
66+
- IPAM
67+
- IPC
6368
- JAR
6469
- JSON
6570
- JSX
@@ -79,6 +84,7 @@ exceptions:
7984
- NVDA
8085
- OCI
8186
- OS
87+
- OSI
8288
- OSS
8389
- PATH
8490
- PDF
@@ -91,6 +97,7 @@ exceptions:
9197
- RAM
9298
- REPL
9399
- REST
100+
- RFC
94101
- RHEL
95102
- RPM
96103
- RSA
@@ -125,8 +132,10 @@ exceptions:
125132
- USB
126133
- USD
127134
- UTF
135+
- UTS
128136
- UUID
129137
- VAT
138+
- VIP
130139
- VLAN
131140
- VM
132141
- VPN

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,20 @@ Zsh
104104
[Bb]uildx
105105
[Cc]odenames?
106106
[Cc]ompose
107+
[Cc]onfigs
107108
[Dd]istroless
108109
[Ff]ilepaths?
109110
[Ff]iletypes?
110111
[GgCc]oroutine
112+
[Hh]ealthcheck
111113
[Hh]ostname
112114
[Ii]nfosec
115+
[Ii]nline
113116
[Kk]eyrings?
114117
[Ll]oopback
115118
[Mm]emcached
116119
[Mm]oby
120+
[Mm]ountpoint
117121
[Nn]amespace
118122
[Oo]nboarding
119123
[Pp]aravirtualization
@@ -126,6 +130,7 @@ Zsh
126130
[Ss]andbox(ed)?
127131
[Ss]eccomp
128132
[Ss]ubmounts?
133+
[Ss]ubnet
129134
[Ss]ubpaths?
130135
[Ss]ubtrees?
131136
[Ss]wappable
@@ -146,6 +151,7 @@ Zsh
146151
cgroup
147152
config
148153
containerd
154+
datacenter
149155
deprovisioning
150156
deserialization
151157
deserialize
@@ -160,7 +166,6 @@ kubectl
160166
kubefwd
161167
kubelet
162168
lookup
163-
label_file
164169
macOS
165170
macvlan
166171
mfsymlinks
@@ -174,15 +179,18 @@ npm
174179
osquery
175180
osxfs
176181
pgAdmin
182+
rollback
177183
rootful
178184
runc
179185
snapshotters?
180186
stdin
181187
stdout
182-
subnet
188+
syntaxes
189+
sysctls
183190
systemd
184191
tmpfs
185192
ufw
193+
uid
186194
umask
187195
vSphere
188196
vpnkit

content/manuals/compose/how-tos/use-secrets.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Environment variables are often available to all processes, and it can be diffic
1717

1818
## Use secrets
1919

20+
Secrets are mounted as a file in `/run/secrets/<secret_name>` inside the container.
21+
2022
Getting a secret into a container is a two-step process. First, define the secret using the [top-level secrets element in your Compose file](/reference/compose-file/secrets.md). Next, update your service definitions to reference the secrets they require with the [secrets attribute](/reference/compose-file/services.md#secrets). Compose grants access to secrets on a per-service basis.
2123

2224
Unlike the other methods, this permits granular access control within a service container via standard filesystem permissions.

content/manuals/desktop/release-notes.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
3636
- Fixed an issue that caused the AI Catalog in Docker Hub to be unavailable in Docker Desktop.
3737
- Fixed an issue that caused Docker Desktop to panic with `index out of range [0] with length 0` when using [Enhanced Container Isolation](/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md).
3838

39+
### Known issues
40+
41+
#### For Mac
42+
43+
- Docker Desktop for Mac might fail to start with macOS reporting either `com.docker.vmnetd` or `com.docker.socket` is malware. As a workaround, follow the steps below:
44+
1. Quit Docker and kill and related processes using the Activity Monitor.
45+
2. Run: `sudo cp /Applications/Docker.app/Contents/Library/LaunchServices/com.docker.vmnetd /Library/PrivilegedHelperTools/`.
46+
3. Run: `sudo cp /Applications/Docker.app/Contents/MacOS/com.docker.socket /Library/PrivilegedHelperTools/`.
47+
4. Restart Docker Desktop.
48+
5. If this doesn't work, update to a later version and rerun the steps. See [docker/for-mac#7520](https://github.com/docker/for-mac/issues/7520)
49+
3950
## 4.37.0
4051

4152
{{< release-date date="2024-12-12" >}}
@@ -591,6 +602,8 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
591602

592603
{{< release-date date="2024-05-06" >}}
593604

605+
{{< desktop-install all=true beta_win_arm=true version="4.30.0" build_path="/149282/" >}}
606+
594607
### New
595608

596609
#### For all platforms
@@ -671,6 +684,8 @@ This can be resolved by adding the user to the **docker-users** group. Before st
671684

672685
{{< release-date date="2024-04-08" >}}
673686

687+
{{< desktop-install all=true beta_win_arm=true version="4.29.0" build_path="/145265/" >}}
688+
674689
### New
675690

676691
- You can now enforce Rosetta usage via [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md).

0 commit comments

Comments
 (0)