Skip to content

Commit f0bca0e

Browse files
authored
Merge pull request #21865 from docker/published-update
publish updates from main
2 parents 924a36d + 48cb69f commit f0bca0e

File tree

12 files changed

+160
-11
lines changed

12 files changed

+160
-11
lines changed

_vendor/github.com/docker/buildx/docs/bake-reference.md

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v27.5.0+incompatible
22
# github.com/moby/buildkit v0.19.0
3-
# github.com/docker/buildx v0.20.0
3+
# github.com/docker/buildx v0.20.1
44
# github.com/docker/cli v27.5.0+incompatible
55
# github.com/docker/compose/v2 v2.32.4
66
# github.com/docker/scout-cli v1.15.0

content/manuals/billing/docker-hub-pricing.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ to help you understand your storage consumption and costs.
1010

1111
> [!NOTE]
1212
>
13-
> Docker Hub plan limits will take effect on March 1, 2025. No charge on Docker Hub image pulls
13+
> Docker Hub plan limits will take effect on March 1, 2025. No charges on Docker Hub image pulls
1414
or storage will be incurred from December 10, 2024 and February 28, 2025.
1515

1616
## How storage is measured
@@ -23,18 +23,18 @@ Docker Hub measures storage using:
2323

2424
## How storage is calculated
2525

26-
Docker subscription plans include a specific amount of allocated
26+
[Docker subscription plans](/manuals/subscription/details.md) include a specific amount of allocated
2727
private repository storage:
2828

2929
- Personal plan: Includes up to 2GB of storage.
3030
- Pro plan: Includes up to 5GB of storage.
3131
- Team plan: Includes up to 50GB of storage.
3232
- Business plan: Includes up to 500GB of storage.
3333

34-
Docker Hub determines additional charges based on your average monthly usage of private repository storage.
34+
Docker Hub determines additional charges based on your average monthly usage of private repository storage. If a repository is private at any point within an hour, it is counted as private for the full hour.
3535

3636
If you go over your allocated private repository storage, you will incur overage
37-
costs. To calculate overage costs the included storage for your plan is subtracted from your average monthly
37+
costs. To calculate overage costs, the included storage for your plan is subtracted from your average monthly
3838
usage.
3939

4040
## Docker Hub consumption pricing
@@ -56,7 +56,7 @@ at the end of your billing cycle.
5656

5757
### Storage carryover
5858

59-
If you pre-pay for storage, your purchased storage is valid for the entire subscription period. You can use it any time during that period, and any unused portion will roll over to the next month until the subscription period ends.
59+
If you pre-pay for storage, your purchased storage is valid for your entire subscription period. You can use it any time during that period, and any unused portion will roll over to the next month until the subscription period ends.
6060

6161
In the following example, a customer with an annual Business plan pre-pays for 500GB of storage for the year. Their plan includes a base allocation of 500GB of storage per month.
6262
- In January, they use 510 GB-month, exceed their base allocation, and use 10GB from their pre-paid storage. Their remaining pre-paid
@@ -68,7 +68,7 @@ storage is 490GB.
6868
|---------------------------------|----------|----------|---------|
6969
| Included GB-month | 500 | 500 | 500 |
7070
| Used storage in month | 510 | 450 | 600 |
71-
| Overage in GB-month | 10 | 0 | 100 |
71+
| Overage in GB-month | 10 | 0 | 100 |
7272
| Remaining pre-purchased storage | 490 | 490 | 390 |
7373

7474
At the end of March, the customer has 390GB of pre-purchased storage left to use for the rest of the year.

content/manuals/desktop/release-notes.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
9292
- Fixed a bug where resetting default settings would also reset the CLI context.
9393
- Fixed a bug where the Docker Desktop Dashboard would get out of sync with the Docker daemon after restarting the engine while in Resource Saver mode (Windows with WSL2 backend only) or after switching engines (macOS).
9494
- Fixed a bug where Resource Saver mode would fail to re-engage after restarting the engine while in Resource Saver mode.
95+
- Build UI:
96+
- Fixed a bug where the source file could not be found for some builds.
97+
- Fixed a bug where error logs were not displayed in the **Source** tab.
98+
- Fixed a bug where users had to scroll to the bottom for error logs in **Source** tab.
99+
- Fixed a bug where timestamps would be broken in the **Logs** tab.
95100

96101
#### For Mac
97102

@@ -178,6 +183,13 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
178183
- Fixed a bug that restricted containers using `--network=host` to 18 open host ports.
179184
- Fixed bind mount ownership for non-root containers. Fixes [docker/for-mac#6243](https://github.com/docker/for-mac/issues/6243).
180185
- Docker Desktop will not unpause automatically after a manual pause. The system will stay paused until you manually resume the Docker engine. This fixes a bug where other software would accidentally trigger a resume by running a CLI command in the background. Fixes [for-mac/#6908](https://github.com/docker/for-mac/issues/6908)
186+
- Build UI:
187+
- The **Source** tab now supports multiple source files.
188+
- Links for image dependencies in the **Info** tab now support other well-known registries such as GitHub, Google, and GitLab.
189+
- Disabled the **Delete** button if only cloud builds are selected.
190+
- Fixed an issue where users were unable to delete builds.
191+
- Fixed malformed Jaeger traces that were missing events and links.
192+
- Fixed missing export attributes when building with the cloud driver.
181193

182194
#### For Mac
183195

content/manuals/desktop/setup/allow-list.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ This page contains the domain URLs that you need to add to a firewall allowlist
2929
|https://hub.docker.com| Docker Pull/Push |
3030
|https://registry-1.docker.io| Docker Pull/Push |
3131
|https://production.cloudflare.docker.com| Docker Pull/Push |
32+
|https://docker-images-prod.r2.cloudflarestorage.com| Docker Pull/Push |
3233
|https://docker-pinata-support.s3.amazonaws.com| Troubleshooting |
3334
|https://api.dso.docker.com| Docker Scout service |

content/manuals/engine/release-notes/27.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,28 @@ For more information about:
2727

2828
Release notes for Docker Engine version 27.5 releases.
2929

30+
## 27.5.1
31+
32+
{{< release-date date="2025-01-22" >}}
33+
34+
For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:
35+
36+
- [docker/cli, 27.5.1 milestone](https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A27.5.1)
37+
- [moby/moby, 27.5.1 milestone](https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A27.5.1)
38+
39+
40+
### Bug fixes and enhancements
41+
42+
- Fix an issue that could persistently prevent daemon startup after failure to initialize the default bridge. [moby/moby#49307](https://github.com/moby/moby/pull/49307)
43+
- Add a `DOCKER_IGNORE_BR_NETFILTER_ERROR` environment variable. Setting it to `1` allows running on hosts that cannot load `br_netfilter`. Some things won't work, including disabling inter-container communication in a bridge network. With the userland proxy disabled, it won't be possible to access one container's published ports from another container on the same network. [moby/moby#49306](https://github.com/moby/moby/pull/49306)
44+
45+
### Packaging updates
46+
47+
- Update Go runtime to 1.22.11 (fix CVE-2024-45341, CVE-2024-45336). [moby/moby#49312](https://github.com/moby/moby/pull/49312), [docker/docker-ce-packaging#1147](https://github.com/docker/docker-ce-packaging/pull/1147), [docker/cli#5762](https://github.com/docker/cli/pull/5762)
48+
- Update RootlessKit to v2.3.2 to support `passt` >= 2024_10_30.ee7d0b6. [moby/moby#49304](https://github.com/moby/moby/pull/49304)
49+
- Update Buildx to [v0.20.0](https://github.com/docker/buildx/releases/tag/v0.20.0). [docker/docker-ce-packaging#1149](https://github.com/docker/docker-ce-packaging/pull/1149)
50+
51+
3052
### 27.5.0
3153

3254
{{< release-date date="2025-01-13" >}}

content/manuals/security/faqs/single-sign-on/faqs.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ other sensitive data in the directory. Due to potential security risks, Docker
5858
doesn't support this configuration. Instead, Docker recommends [configuring SCIM
5959
to enable group sync
6060
securely](/security/for-admins/provisioning/group-mapping/#use-group-mapping-with-scim).
61+
62+
### Are there any firewall rules required for SSO configuration?
63+
64+
No. There are no specific firewall rules required for configuring SSO, as long as the domain `login.docker.com` is accessible. This domain is commonly accessible by default. However, in rare cases, some organizations may have firewall restrictions in place that block this domain. If you encounter issues during SSO setup, ensure that `login.docker.com` is allowed in your network's firewall settings.

content/manuals/security/for-admins/access-tokens.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ title: Organization access tokens
33
description: Learn how to create and manage organization access tokens
44
to securely push and pull images programmatically.
55
keywords: docker hub, security, OAT, organization access token
6-
linkTitle: Organization access tokens (Beta)
6+
linkTitle: Organization access tokens
7+
params:
8+
sidebar:
9+
badge:
10+
color: blue
11+
text: Beta
712
---
813

914
{{< summary-bar feature_name="OATs" >}}

data/buildx/docker_buildx_bake.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ options:
2020
value_type: stringArray
2121
default_value: '[]'
2222
description: Allow build to access specified resources
23+
details_url: '#allow'
2324
deprecated: false
2425
hidden: false
2526
experimental: false
@@ -218,6 +219,80 @@ inherited_options:
218219
kubernetes: false
219220
swarm: false
220221
examples: |-
222+
### Allow extra privileged entitlement (--allow) {#allow}
223+
224+
```text
225+
--allow=ENTITLEMENT[=VALUE]
226+
```
227+
228+
Entitlements are designed to provide controlled access to privileged
229+
operations. By default, Buildx and BuildKit operates with restricted
230+
permissions to protect users and their systems from unintended side effects or
231+
security risks. The `--allow` flag explicitly grants access to additional
232+
entitlements, making it clear when a build or bake operation requires elevated
233+
privileges.
234+
235+
In addition to BuildKit's `network.host` and `security.insecure` entitlements
236+
(see [`docker buildx build --allow`](/reference/cli/docker/buildx/build/#allow),
237+
Bake supports file system entitlements that grant granular control over file
238+
system access. These are particularly useful when working with builds that need
239+
access to files outside the default working directory.
240+
241+
Bake supports the following filesystem entitlements:
242+
243+
- `--allow fs=<path|*>` - Grant read and write access to files outside of the
244+
working directory.
245+
- `--allow fs.read=<path|*>` - Grant read access to files outside of the
246+
working directory.
247+
- `--allow fs.write=<path|*>` - Grant write access to files outside of the
248+
working directory.
249+
250+
The `fs` entitlements take a path value (relative or absolute) to a directory
251+
on the filesystem. Alternatively, you can pass a wildcard (`*`) to allow Bake
252+
to access the entire filesystem.
253+
254+
### Example: fs.read
255+
256+
Given the following Bake configuration, Bake would need to access the parent
257+
directory, relative to the Bake file.
258+
259+
```hcl
260+
target "app" {
261+
context = "../src"
262+
}
263+
```
264+
265+
Assuming `docker buildx bake app` is executed in the same directory as the
266+
`docker-bake.hcl` file, you would need to explicitly allow Bake to read from
267+
the `../src` directory. In this case, the following invocations all work:
268+
269+
```console
270+
$ docker buildx bake --allow fs.read=* app
271+
$ docker buildx bake --allow fs.read=../src app
272+
$ docker buildx bake --allow fs=* app
273+
```
274+
275+
### Example: fs.write
276+
277+
The following `docker-bake.hcl` file requires write access to the `/tmp`
278+
directory.
279+
280+
```hcl
281+
target "app" {
282+
output = "/tmp"
283+
}
284+
```
285+
286+
Assuming `docker buildx bake app` is executed outside of the `/tmp` directory,
287+
you would need to allow the `fs.write` entitlement, either by specifying the
288+
path or using a wildcard:
289+
290+
```console
291+
$ docker buildx bake --allow fs=/tmp app
292+
$ docker buildx bake --allow fs.write=/tmp app
293+
$ docker buildx bake --allow fs.write=* app
294+
```
295+
221296
### Override the configured builder instance (--builder) {#builder}
222297
223298
Same as [`buildx --builder`](/reference/cli/docker/buildx/#builder).

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/docker/docs
33
go 1.23.1
44

55
require (
6-
github.com/docker/buildx v0.20.0 // indirect
6+
github.com/docker/buildx v0.20.1 // indirect
77
github.com/docker/cli v27.5.0+incompatible // indirect
88
github.com/docker/compose/v2 v2.32.4 // indirect
99
github.com/docker/scout-cli v1.15.0 // indirect
@@ -12,7 +12,7 @@ require (
1212
)
1313

1414
replace (
15-
github.com/docker/buildx => github.com/docker/buildx v0.20.0
15+
github.com/docker/buildx => github.com/docker/buildx v0.20.1
1616
github.com/docker/cli => github.com/docker/cli v27.5.0+incompatible
1717
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4
1818
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0

0 commit comments

Comments
 (0)