From d3530dd999b1259b0a14b72ca0e52436a56771cc Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:59:01 +0000 Subject: [PATCH 1/4] dd-cli-cicd-fix (#22187) ## Description Clarity as per support's request https://docker.slack.com/archives/C027X59V596/p1741283172585929 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/features/desktop-cli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/desktop/features/desktop-cli.md b/content/manuals/desktop/features/desktop-cli.md index 6c188b4a60d0..b065de091aa8 100644 --- a/content/manuals/desktop/features/desktop-cli.md +++ b/content/manuals/desktop/features/desktop-cli.md @@ -17,7 +17,7 @@ The Docker Desktop CLI lets you perform key operations such as starting, stoppin The Docker Desktop CLI provides: -- Enhanced automation and CI/CD integration: Perform Docker Desktop operations directly in CI/CD pipelines for better workflow automation. +- Simplified automation for local development: Execute Docker Desktop operations more efficiently in scripts and tests. - 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. ## Usage From 844f92ceecd8eb632e191fad782f0600c7e1434d Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 7 Mar 2025 16:01:29 +0100 Subject: [PATCH 2/4] build: fix intro of distributed build section (#22189) ## Description Oversight from https://github.com/docker/docs/pull/22126. We have a single tag being pushed. ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .../manuals/build/ci/github-actions/multi-platform.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/content/manuals/build/ci/github-actions/multi-platform.md b/content/manuals/build/ci/github-actions/multi-platform.md index 813db98233cc..787abccda09d 100644 --- a/content/manuals/build/ci/github-actions/multi-platform.md +++ b/content/manuals/build/ci/github-actions/multi-platform.md @@ -109,13 +109,8 @@ each platform across multiple runners and create manifest list using the The following workflow will build the image for each platform on a dedicated runner using a matrix strategy and push by digest. Then, the `merge` job will -create manifest lists and push them to two registries: - -- Docker Hub: `docker.io/docker-user/my-app` -- GitHub Container Registry: `ghcr.io/gh-user/my-app` - -This example also uses the [`metadata` action](https://github.com/docker/metadata-action) -to set tags and labels. +create manifest lists and push them to Docker Hub. The [`metadata` action](https://github.com/docker/metadata-action) +is used to set tags and labels. ```yaml name: ci From b708f987cedbbad7b83294185f0ed7c27754277e Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 7 Mar 2025 10:28:39 -0500 Subject: [PATCH 3/4] billing: improve docs for manual payment retries (#22181) ## Description - The question of whether users can manually retry failed payments has come up a few times in Kapa - This adds an FAQ following the failed payment FAQ + a callout to the failed payments section of docs - Will improve Kapa source content + future answers to this common question ## Related issues or tickets - [ENGDOCS-2435](https://docker.atlassian.net/browse/ENGDOCS-2435) - ## Reviews - [ ] Editorial review [ENGDOCS-2435]: https://docker.atlassian.net/browse/ENGDOCS-2435?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- content/manuals/billing/faqs.md | 10 +++++++++- content/manuals/billing/payment-method.md | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/content/manuals/billing/faqs.md b/content/manuals/billing/faqs.md index 460ecff6b2c8..59332b90a938 100644 --- a/content/manuals/billing/faqs.md +++ b/content/manuals/billing/faqs.md @@ -33,6 +33,14 @@ Docker also sends an email notification `Action Required - Credit Card Payment F 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. +### Can I manually retry a failed payment? + +No. Docker retries failed payments on a [retry schedule](/manuals/billing/faqs.md#what-happens-if-my-subscription-payment-fails). + +To ensure a retired payment is successful, verify your default payment is +updated. If you need to update your default payment method, see +[Manage payment method](/manuals/billing/payment-method.md#manage-payment-method). + ### Does Docker collect sales tax and/or VAT? 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). ### Do I need to do anything at the end of my subscription term? -No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment. +No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment. \ No newline at end of file diff --git a/content/manuals/billing/payment-method.md b/content/manuals/billing/payment-method.md index b9caba4c0ade..26d37117699b 100644 --- a/content/manuals/billing/payment-method.md +++ b/content/manuals/billing/payment-method.md @@ -105,6 +105,11 @@ To add a payment method: ## Failed payments +> [!NOTE] +> +> You can't manually retry a failed payment. Docker will retry failed payments +based on the retry schedule. + 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: - 3 days after the due date From 1b3ec1b2567c7953eb852aa293c853d990d9c4fe Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 7 Mar 2025 10:53:10 -0500 Subject: [PATCH 4/4] fix: rendering issue w/ experimental labs include (#22190) ## Description - Rendering issue with includes that contain shortcodes: https://docs.docker.com/build/buildkit/dockerfile-release-notes/#130-labs - Fixed by replacing with the summary bar w/ experimental label - Also updated headings to be aligned - Preview: https://deploy-preview-22190--docsdocker.netlify.app/build/buildkit/dockerfile-release-notes/ ## Related issues or tickets - Reported from @crazy-max ## Reviews - [ ] Technical review - [ ] Editorial review --- content/includes/dockerfile-labs-channel.md | 10 +++----- .../buildkit/dockerfile-release-notes.md | 14 +++++++---- hugo_stats.json | 8 ------- layouts/shortcodes/summary-bar.html | 24 +++++++++---------- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/content/includes/dockerfile-labs-channel.md b/content/includes/dockerfile-labs-channel.md index 029b25a63503..8a7bca00d15b 100644 --- a/content/includes/dockerfile-labs-channel.md +++ b/content/includes/dockerfile-labs-channel.md @@ -1,7 +1,3 @@ ---- ---- - -{{% experimental %}} -The "labs" channel provides early access to Dockerfile features that are not -yet available in the stable channel. -{{% /experimental %}} +> [!IMPORTANT] +> +> The labs channel gives you access to experimental Dockerfile features not yet available in the stable channel. \ No newline at end of file diff --git a/content/manuals/build/buildkit/dockerfile-release-notes.md b/content/manuals/build/buildkit/dockerfile-release-notes.md index 57f74385c951..6aada35dcd6a 100644 --- a/content/manuals/build/buildkit/dockerfile-release-notes.md +++ b/content/manuals/build/buildkit/dockerfile-release-notes.md @@ -28,10 +28,12 @@ The full release note for this release is available - Fix handling of OSVersion platform property if one is set by the base image [moby/buildkit#5714](https://github.com/moby/buildkit/pull/5714) - 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) -## 1.14.0-labs +## 1.14.0 (labs) {{< release-date date="2025-02-19" >}} +{{% include "dockerfile-labs-channel.md" %}} + The full release note for this release is available [on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.14.0-labs). @@ -59,10 +61,12 @@ The full release note for this release is available - Fix case where `ONBUILD` command may have run twice on inherited stage. [moby/buildkit#5593](https://github.com/moby/buildkit/pull/5593) - Fix possible missing named context replacement for child stages in Dockerfile. [moby/buildkit#5596](https://github.com/moby/buildkit/pull/5596) -## 1.13.0-labs +## 1.13.0 (labs) {{< release-date date="2025-01-20" >}} +{{% include "dockerfile-labs-channel.md" %}} + The full release note for this release is available [on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.13.0-labs). @@ -121,7 +125,9 @@ The full release note for this release is available - Enhanced progress output for secret values mounted as environment variables. [moby/buildkit#5336] - Added built-in build argument `TARGETSTAGE` to expose the name of the (final) target stage for the current build. [moby/buildkit#5431] -### 1.11.0-labs +## 1.11.0 (labs) + +{{% include "dockerfile-labs-channel.md" %}} - `COPY --chmod` now supports non-octal values. [moby/buildkit#5380] @@ -484,7 +490,7 @@ The following features have graduated from the labs channel to stable: - Forward `FrontendInputs` to the gateway -## 1.1.2 (experimental) +## 1.1.2 (labs) {{< release-date date="2019-07-31" >}} diff --git a/hugo_stats.json b/hugo_stats.json index c850bbea5352..e7379312f29b 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -10,7 +10,6 @@ "-mt-0.5", "-mt-4", "-mt-8", - "-top-16", "-v", "-z-10", ".NET", @@ -25,8 +24,6 @@ "Bake", "Bash", "Before", - "BitBucket-Pipelines", - "Buildkite", "CLI", "CentOS-RHEL-and-Fedora", "Circle-CI", @@ -38,7 +35,6 @@ "Debian", "Debian-GNU/Linux", "Diff", - "Docker-Compose", "Docker-Desktop", "Docker-Hub", "Docker-Scout-Dashboard", @@ -50,13 +46,11 @@ "Fedora", "For-Mac-with-Apple-silicon", "For-Mac-with-Intel-chip", - "For-all-platforms", "From-the-GUI", "From-the-command-line", "GUI", "Git-Bash", "Git-Bash-CLI", - "GitHub-Actions", "GitLab", "Go", "HTTP", @@ -104,11 +98,9 @@ "Run-Ollama-in-a-container", "Run-Ollama-outside-of-a-container", "Rust", - "Shell", "Shell-script", "Specific-version", "Svelte", - "Travis-CI", "Ubuntu", "Unix-pipe", "Updated-Dockerfile", diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 930eee5c883b..523bf65e68e8 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -23,10 +23,10 @@
{{ with $feature.subscription }} -
- Subscription: +
+ Subscription: {{ range . }} - {{ . }} + {{ . }} {{ $icon := index $subscriptionIcons . }} {{ if $icon }} @@ -41,9 +41,9 @@ {{ with $feature.availability }} {{ $availabilityText := . }} -
- Availability: - +
+ Availability: + {{ $availabilityText }} {{ range $key, $icon := $availabilityIcons }} {{ if in $availabilityText $key }} @@ -55,9 +55,9 @@ {{ end }} {{ with $feature.requires }} -
- Requires: - {{ . | markdownify }} +
+ Requires: + {{ . | markdownify }} {{ partial "icon" $requiresIcon }} @@ -65,9 +65,9 @@ {{ end }} {{ with $feature.for }} -
- For: - {{ . }} +
+ For: + {{ . }} {{ partial "icon" $forIcon }}