Skip to content

Commit bce89cf

Browse files
committed
Merge branch 'main' into makefile-vale
* main: (42 commits) Update image source for kafbat Add missing release note to Docker Desktop release notes (docker#22218) Update build-summary.md feedback link fix: (docker#22212) some clarification on additional_contexts (docker#22204) Update windows-install.md (docker#22184) sso: add callout to certificate instructions (docker#22193) chore: cleanup includes w/ embedded shortcodes (docker#22191) fix: rendering issue w/ experimental labs include (docker#22190) billing: improve docs for manual payment retries (docker#22181) build: fix intro of distributed build section (docker#22189) dd-cli-cicd-fix (docker#22187) Update release note for 4.39 (docker#22188) Change directory after pulling a sample Docker application (docker#22179) Merge pull request docker#22117 from aevesdocker/ENGDOCS-2451 fix: troubleshooting toc fix (docker#22166) Add security section to 4.39.0 release notes (docker#22178) Merge pull request docker#22175 from aevesdocker/ENGDOCS-2470 Merge pull request docker#22160 from sarahsanders-docker/tcc-minutes hub: add troubleshooting (docker#22157) ...
2 parents cb4c1b6 + 9623874 commit bce89cf

File tree

110 files changed

+1296
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1296
-527
lines changed

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Intune
5555
JFrog
5656
Jamf
5757
JetBrains
58+
JUnit
5859
Kerberos
5960
Kitematic
6061
Kubeadm
@@ -80,6 +81,7 @@ Paketo
8081
Postgres
8182
PowerShell
8283
Python
84+
Ryuk
8385
S3
8486
SQLite
8587
Slack

_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 v28.0.1+incompatible
22
# github.com/moby/buildkit v0.20.0
3-
# github.com/docker/buildx v0.21.1
3+
# github.com/docker/buildx v0.21.2
44
# github.com/docker/cli v28.0.1+incompatible
55
# github.com/docker/compose/v2 v2.33.1
66
# github.com/docker/scout-cli v1.15.0

content/get-started/workshop/05_persisting_data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ You can create the volume and start the container using the CLI or Docker Deskto
114114
> ```
115115
>
116116
> For more details about Git Bash's syntax differences, see
117-
> [Working with Git Bash](/desktop/troubleshoot-and-support/troubleshoot/topics/#working-with-git-bash).
117+
> [Working with Git Bash](/desktop/troubleshoot-and-support/troubleshoot/topics/#docker-commands-failing-in-git-bash).
118118
119119
120120
{{< /tab >}}

content/guides/bun/containerize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ directory to a directory that you want to work in, and run the following
3636
command to clone the repository:
3737

3838
```console
39-
$ git clone https://github.com/dockersamples/bun-docker.git
39+
$ git clone https://github.com/dockersamples/bun-docker.git && cd bun-docker
4040
```
4141

4242
You should now have the following contents in your `bun-docker` directory.

content/guides/bun/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In this section, you'll learn how to set up a development environment for your c
2323
Clone the sample application to use with this guide. Open a terminal, change directory to a directory that you want to work in, and run the following command to clone the repository:
2424

2525
```console
26-
$ git clone https://github.com/dockersamples/bun-docker.git
26+
$ git clone https://github.com/dockersamples/bun-docker.git && cd bun-docker
2727
```
2828

2929
## Automatically update services

content/guides/cpp/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ In this section, you'll learn how to set up a development environment for your c
2424
Clone the sample application to use with this guide. Open a terminal, change directory to a directory that you want to work in, and run the following command to clone the repository:
2525

2626
```console
27-
$ git clone https://github.com/dockersamples/c-plus-plus-docker.git
27+
$ git clone https://github.com/dockersamples/c-plus-plus-docker.git && cd c-plus-plus-docker
2828
```
2929

3030
## Automatically update services

content/guides/deno/containerize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ directory to a directory that you want to work in, and run the following
2525
command to clone the repository:
2626

2727
```console
28-
$ git clone https://github.com/dockersamples/docker-deno.git
28+
$ git clone https://github.com/dockersamples/docker-deno.git && cd docker-deno
2929
```
3030

3131
You should now have the following contents in your `deno-docker` directory.

content/guides/deno/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In this section, you'll learn how to set up a development environment for your c
2323
Clone the sample application to use with this guide. Open a terminal, change directory to a directory that you want to work in, and run the following command to clone the repository:
2424

2525
```console
26-
$ git clone https://github.com/dockersamples/docker-deno.git
26+
$ git clone https://github.com/dockersamples/docker-deno.git && cd docker-deno
2727
```
2828

2929
## Automatically update services

content/guides/genai-leveraging-rag/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The system operates as follows:
3838
3. The found information gets added to the original question before passed to LLM
3939
4. The LLM generates responses that blend the model's inherent knowledge with the this extra information.
4040

41-
To hold this vector information in a efficient manner, we need a special type of database.
41+
To hold this vector information in an efficient manner, we need a special type of database.
4242

4343
## Introduction to Graph databases
4444

content/guides/kafka.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ To add it to your own project (it’s already in the demo application), you only
235235
```yaml
236236
services:
237237
kafka-ui:
238-
image: ghcr.io/kafbat/kafka-ui:latest
238+
image: kafbat/kafka-ui:main
239239
ports:
240240
- 8080:8080
241241
environment:

0 commit comments

Comments
 (0)