Skip to content

Commit 5435caa

Browse files
aevesdockercrazy-maxsarahsanders-docker
authored
publish updates from main (#22192)
Automated pull request for publishing docs updates. --------- Signed-off-by: CrazyMax <[email protected]> Co-authored-by: Allie Sadler <[email protected]> Co-authored-by: CrazyMax <[email protected]> Co-authored-by: Sarah Sanders <[email protected]>
2 parents dbf0620 + 1b3ec1b commit 5435caa

File tree

8 files changed

+42
-40
lines changed

8 files changed

+42
-40
lines changed
Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
---
2-
---
3-
4-
{{% experimental %}}
5-
The "labs" channel provides early access to Dockerfile features that are not
6-
yet available in the stable channel.
7-
{{% /experimental %}}
1+
> [!IMPORTANT]
2+
>
3+
> The labs channel gives you access to experimental Dockerfile features not yet available in the stable channel.

content/manuals/billing/faqs.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ Docker also sends an email notification `Action Required - Credit Card Payment F
3333

3434
Once the grace period is over and the invoice is still not paid, the subscription downgrades to a free plan and all paid features are disabled.
3535

36+
### Can I manually retry a failed payment?
37+
38+
No. Docker retries failed payments on a [retry schedule](/manuals/billing/faqs.md#what-happens-if-my-subscription-payment-fails).
39+
40+
To ensure a retired payment is successful, verify your default payment is
41+
updated. If you need to update your default payment method, see
42+
[Manage payment method](/manuals/billing/payment-method.md#manage-payment-method).
43+
3644
### Does Docker collect sales tax and/or VAT?
3745

3846
Docker began collecting sales tax on subscription fees for United States customers on July 1, 2024. For European customers, Docker will begin collecting VAT on March 1, 2025.
@@ -49,4 +57,4 @@ Contact the [Docker Sales Team](https://www.docker.com/company/contact).
4957

5058
### Do I need to do anything at the end of my subscription term?
5159

52-
No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.
60+
No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.

content/manuals/billing/payment-method.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ To add a payment method:
105105

106106
## Failed payments
107107

108+
> [!NOTE]
109+
>
110+
> You can't manually retry a failed payment. Docker will retry failed payments
111+
based on the retry schedule.
112+
108113
If your subscription payment fails, there is a grace period of 15 days, including the due date. Docker retries to collect the payment 3 times using the following schedule:
109114

110115
- 3 days after the due date

content/manuals/build/buildkit/dockerfile-release-notes.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ The full release note for this release is available
2828
- Fix handling of OSVersion platform property if one is set by the base image [moby/buildkit#5714](https://github.com/moby/buildkit/pull/5714)
2929
- Fix errors where a named context metadata could be resolved even if it was not reachable by the current build configuration, leading to build errors [moby/buildkit#5688](https://github.com/moby/buildkit/pull/5688)
3030

31-
## 1.14.0-labs
31+
## 1.14.0 (labs)
3232

3333
{{< release-date date="2025-02-19" >}}
3434

35+
{{% include "dockerfile-labs-channel.md" %}}
36+
3537
The full release note for this release is available
3638
[on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.14.0-labs).
3739

@@ -59,10 +61,12 @@ The full release note for this release is available
5961
- Fix case where `ONBUILD` command may have run twice on inherited stage. [moby/buildkit#5593](https://github.com/moby/buildkit/pull/5593)
6062
- Fix possible missing named context replacement for child stages in Dockerfile. [moby/buildkit#5596](https://github.com/moby/buildkit/pull/5596)
6163

62-
## 1.13.0-labs
64+
## 1.13.0 (labs)
6365

6466
{{< release-date date="2025-01-20" >}}
6567

68+
{{% include "dockerfile-labs-channel.md" %}}
69+
6670
The full release note for this release is available
6771
[on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.13.0-labs).
6872

@@ -121,7 +125,9 @@ The full release note for this release is available
121125
- Enhanced progress output for secret values mounted as environment variables. [moby/buildkit#5336]
122126
- Added built-in build argument `TARGETSTAGE` to expose the name of the (final) target stage for the current build. [moby/buildkit#5431]
123127

124-
### 1.11.0-labs
128+
## 1.11.0 (labs)
129+
130+
{{% include "dockerfile-labs-channel.md" %}}
125131

126132
- `COPY --chmod` now supports non-octal values. [moby/buildkit#5380]
127133

@@ -484,7 +490,7 @@ The following features have graduated from the labs channel to stable:
484490

485491
- Forward `FrontendInputs` to the gateway
486492

487-
## 1.1.2 (experimental)
493+
## 1.1.2 (labs)
488494

489495
{{< release-date date="2019-07-31" >}}
490496

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,8 @@ 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 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`
116-
117-
This example also uses the [`metadata` action](https://github.com/docker/metadata-action)
118-
to set tags and labels.
112+
create manifest lists and push them to Docker Hub. The [`metadata` action](https://github.com/docker/metadata-action)
113+
is used to set tags and labels.
119114

120115
```yaml
121116
name: ci

content/manuals/desktop/features/desktop-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The Docker Desktop CLI lets you perform key operations such as starting, stoppin
1717

1818
The Docker Desktop CLI provides:
1919

20-
- Enhanced automation and CI/CD integration: Perform Docker Desktop operations directly in CI/CD pipelines for better workflow automation.
20+
- Simplified automation for local development: Execute Docker Desktop operations more efficiently in scripts and tests.
2121
- An improved developer experience: Restart, quit, or reset Docker Desktop from the command line, reducing dependency on the Docker Desktop Dashboard and improving flexibility and efficiency.
2222

2323
## Usage

hugo_stats.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"-mt-0.5",
1111
"-mt-4",
1212
"-mt-8",
13-
"-top-16",
1413
"-v",
1514
"-z-10",
1615
".NET",
@@ -25,8 +24,6 @@
2524
"Bake",
2625
"Bash",
2726
"Before",
28-
"BitBucket-Pipelines",
29-
"Buildkite",
3027
"CLI",
3128
"CentOS-RHEL-and-Fedora",
3229
"Circle-CI",
@@ -38,7 +35,6 @@
3835
"Debian",
3936
"Debian-GNU/Linux",
4037
"Diff",
41-
"Docker-Compose",
4238
"Docker-Desktop",
4339
"Docker-Hub",
4440
"Docker-Scout-Dashboard",
@@ -50,13 +46,11 @@
5046
"Fedora",
5147
"For-Mac-with-Apple-silicon",
5248
"For-Mac-with-Intel-chip",
53-
"For-all-platforms",
5449
"From-the-GUI",
5550
"From-the-command-line",
5651
"GUI",
5752
"Git-Bash",
5853
"Git-Bash-CLI",
59-
"GitHub-Actions",
6054
"GitLab",
6155
"Go",
6256
"HTTP",
@@ -104,11 +98,9 @@
10498
"Run-Ollama-in-a-container",
10599
"Run-Ollama-outside-of-a-container",
106100
"Rust",
107-
"Shell",
108101
"Shell-script",
109102
"Specific-version",
110103
"Svelte",
111-
"Travis-CI",
112104
"Ubuntu",
113105
"Unix-pipe",
114106
"Updated-Dockerfile",

layouts/shortcodes/summary-bar.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<div class="flex flex-col bg-gray-light-200 bg-opacity-75 dark:bg-gray-dark-300 dark:bg-opacity-75 border-l-4 border-gray-light-200 px-4 py-1 my-1 not-prose">
2525
{{ with $feature.subscription }}
26-
<div class="flex items-center gap-1">
27-
<span class="font-bold">Subscription:</span>
26+
<div class="flex flex-wrap items-start gap-1">
27+
<span class="font-bold whitespace-nowrap">Subscription:</span>
2828
{{ range . }}
29-
<span>{{ . }}</span>
29+
<span class="flex-1">{{ . }}</span>
3030
<span class="icon-svg">
3131
{{ $icon := index $subscriptionIcons . }}
3232
{{ if $icon }}
@@ -41,9 +41,9 @@
4141

4242
{{ with $feature.availability }}
4343
{{ $availabilityText := . }}
44-
<div class="flex items-center gap-1">
45-
<span class="font-bold">Availability:</span>
46-
<span>
44+
<div class="flex flex-wrap items-start gap-1">
45+
<span class="font-bold whitespace-nowrap">Availability:</span>
46+
<span class="flex-1">
4747
{{ $availabilityText }}
4848
{{ range $key, $icon := $availabilityIcons }}
4949
{{ if in $availabilityText $key }}
@@ -55,19 +55,19 @@
5555
{{ end }}
5656

5757
{{ with $feature.requires }}
58-
<div class="flex items-center gap-1">
59-
<span class="font-bold">Requires:</span>
60-
<span>{{ . | markdownify }}</span>
58+
<div class="flex flex-wrap items-start gap-1">
59+
<span class="font-bold whitespace-nowrap">Requires:</span>
60+
<span class="flex-1">{{ . | markdownify }}</span>
6161
<span class="icon-svg">
6262
{{ partial "icon" $requiresIcon }}
6363
</span>
6464
</div>
6565
{{ end }}
6666

6767
{{ with $feature.for }}
68-
<div class="flex items-center gap-1">
69-
<span class="font-bold">For:</span>
70-
<span>{{ . }}</span>
68+
<div class="flex flex-wrap items-start gap-1">
69+
<span class="font-bold whitespace-nowrap">For:</span>
70+
<span class="flex-1">{{ . }}</span>
7171
<span class="icon-svg">
7272
{{ partial "icon" $forIcon }}
7373
</span>

0 commit comments

Comments
 (0)