Skip to content

Commit fa6bfb9

Browse files
authored
Merge pull request #21680 from docker/published-update
publish updates from main
2 parents 7ff423b + 2742bba commit fa6bfb9

File tree

6 files changed

+88
-14
lines changed

6 files changed

+88
-14
lines changed

_vale/Docker/Acronyms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ exceptions:
7373
- NET
7474
- NFS
7575
- NOTE
76+
- NTFS
7677
- NTLM
7778
- NUMA
7879
- NVDA

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,4 @@ ufw
186186
umask
187187
vSphere
188188
vpnkit
189+
windowsfilter

content/guides/_index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ params:
66
icon: developer_guide
77
layout: landing
88
aliases:
9-
- /learning-paths/
9+
- /guides/language/
1010
- /language/
11+
- /learning-paths/
1112
---
1213

1314
Explore our collection of guides to learn how Docker can optimize your

content/manuals/build/ci/github-actions/multi-platform.md

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ each platform across multiple runners and create manifest list using the
109109

110110
The following workflow will build the image for each platform on a dedicated
111111
runner using a matrix strategy and push by digest. Then, the `merge` job will
112-
create a manifest list and push it to Docker Hub.
112+
create manifest lists and push them to two registries:
113+
114+
- Docker Hub: `docker.io/docker-user/my-app`
115+
- GitHub Container Registry: `ghcr.io/gh-user/my-app`
113116

114117
This example also uses the [`metadata` action](https://github.com/docker/metadata-action)
115118
to set tags and labels.
@@ -121,7 +124,8 @@ on:
121124
push:
122125
123126
env:
124-
REGISTRY_IMAGE: user/app
127+
DOCKERHUB_REPO: docker-user/my-app
128+
GHCR_REPO: ghcr.io/gh-user/my-app
125129
126130
jobs:
127131
build:
@@ -131,8 +135,6 @@ jobs:
131135
matrix:
132136
platform:
133137
- linux/amd64
134-
- linux/arm/v6
135-
- linux/arm/v7
136138
- linux/arm64
137139
steps:
138140
- name: Prepare
@@ -144,14 +146,23 @@ jobs:
144146
id: meta
145147
uses: docker/metadata-action@v5
146148
with:
147-
images: ${{ env.REGISTRY_IMAGE }}
149+
images: |
150+
${{ env.DOCKERHUB_REPO }}
151+
${{ env.GHCR_REPO }}
148152
149153
- name: Login to Docker Hub
150154
uses: docker/login-action@v3
151155
with:
152156
username: ${{ vars.DOCKERHUB_USERNAME }}
153157
password: ${{ secrets.DOCKERHUB_TOKEN }}
154158
159+
- name: Login to GHCR
160+
uses: docker/login-action@v3
161+
with:
162+
registry: ghcr.io
163+
username: ${{ github.repository_owner }}
164+
password: ${{ secrets.GITHUB_TOKEN }}
165+
155166
- name: Set up QEMU
156167
uses: docker/setup-qemu-action@v3
157168
@@ -164,7 +175,7 @@ jobs:
164175
with:
165176
platforms: ${{ matrix.platform }}
166177
labels: ${{ steps.meta.outputs.labels }}
167-
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
178+
outputs: type=image,"name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
168179
169180
- name: Export digest
170181
run: |
@@ -198,24 +209,41 @@ jobs:
198209
username: ${{ vars.DOCKERHUB_USERNAME }}
199210
password: ${{ secrets.DOCKERHUB_TOKEN }}
200211
212+
- name: Login to GHCR
213+
uses: docker/login-action@v3
214+
with:
215+
registry: ghcr.io
216+
username: ${{ github.repository_owner }}
217+
password: ${{ secrets.GITHUB_TOKEN }}
218+
201219
- name: Set up Docker Buildx
202220
uses: docker/setup-buildx-action@v3
203221
204222
- name: Docker meta
205223
id: meta
206224
uses: docker/metadata-action@v5
207225
with:
208-
images: ${{ env.REGISTRY_IMAGE }}
226+
images: |
227+
${{ env.DOCKERHUB_REPO }}
228+
${{ env.GHCR_REPO }}
229+
tags: |
230+
type=ref,event=branch
231+
type=ref,event=pr
232+
type=semver,pattern={{version}}
233+
type=semver,pattern={{major}}.{{minor}}
209234
210235
- name: Create manifest list and push
211236
working-directory: /tmp/digests
212237
run: |
213238
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
214-
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
239+
$(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
240+
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
241+
$(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
215242
216243
- name: Inspect image
217244
run: |
218-
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
245+
docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
246+
docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }}
219247
```
220248

221249
### With Bake

content/manuals/engine/storage/drivers/select-storage-driver.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ Docker host. After you have read the [storage driver overview](./_index.md), the
1919
next step is to choose the best storage driver for your workloads. Use the storage
2020
driver with the best overall performance and stability in the most usual scenarios.
2121

22+
> [!NOTE]
23+
> This page discusses storage drivers for Docker Engine on Linux. If you're
24+
> running the Docker daemon with Windows as the host OS, the only supported
25+
> storage driver is windowsfilter. For more information, see
26+
> [windowsfilter](windowsfilter-driver.md).
27+
2228
The Docker Engine provides the following storage drivers on Linux:
2329

2430
| Driver | Description |
@@ -189,7 +195,8 @@ to physical or logical disks on the Docker host.
189195
190196
## Related information
191197

192-
- [About images, containers, and storage drivers](./_index.md)
193-
- [`overlay2` storage driver in practice](overlayfs-driver.md)
194-
- [`btrfs` storage driver in practice](btrfs-driver.md)
195-
- [`zfs` storage driver in practice](zfs-driver.md)
198+
- [Storage drivers](./_index.md)
199+
- [`overlay2` storage driver](overlayfs-driver.md)
200+
- [`btrfs` storage driver](btrfs-driver.md)
201+
- [`zfs` storage driver](zfs-driver.md)
202+
- [`windowsfilter` storage driver](windowsfilter-driver.md)
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
description: Learn about the windowsfilter storage driver
3+
keywords: container, storage, driver, windows, windowsfilter
4+
title: windowsfilter storage driver
5+
---
6+
7+
The windowsfilter storage driver is the default storage driver for Docker
8+
Engine on Windows. The windowsfilter driver uses Windows-native file system
9+
layers to for storing Docker layers and volume data on disk. The windowsfilter
10+
storage driver only works on file systems formatted with NTFS.
11+
12+
## Configure the windowsfilter storage driver
13+
14+
For most use case, no configuring the windowsfilter storage driver is not
15+
necessary.
16+
17+
The default storage limit for Docker Engine on Windows is 127GB. To use a
18+
different storage size, set the `size` option for the windowsfilter storage
19+
driver. See [windowsfilter options](/reference/cli/dockerd.md#windowsfilter-options).
20+
21+
Data is stored on the Docker host in `image` and `windowsfilter` subdirectories
22+
within `C:\ProgramData\docker` by default. You can change the storage location
23+
by configuring the `data-root` option in the [Daemon configuration file](/reference/cli/dockerd.md#on-windows):
24+
25+
```json
26+
{
27+
"data-root": "d:\\docker"
28+
}
29+
```
30+
31+
You must restart the daemon for the configuration change to take effect.
32+
33+
## Additional information
34+
35+
For more information about how container storage works on Windows, refer to
36+
Microsoft's [Containers on Windows documentation](https://learn.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-storage).

0 commit comments

Comments
 (0)