Skip to content

Commit 70d9e60

Browse files
nisraelnisrael
authored
Merge branch 'docker:main' into patch-1
2 parents a629b94 + b40e4e7 commit 70d9e60

File tree

51 files changed

+1316
-105
lines changed

Some content is hidden

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

51 files changed

+1316
-105
lines changed

‎.github/workflows/merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
git fetch origin main:main
2525
git reset --hard main
2626
- name: Create Pull Request
27-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
27+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
2828
with:
2929
delete-branch: false
3030
branch: published-update

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ contribute, see [CONTRIBUTING.md](CONTRIBUTING.md).
4949

5050
## Copyright and license
5151

52-
Copyright 2013-2024 Docker, Inc., released under the <a href="https://github.com/docker/docs/blob/main/LICENSE">Apache 2.0 license</a> .
52+
Copyright 2013-2025 Docker, Inc., released under the <a href="https://github.com/docker/docs/blob/main/LICENSE">Apache 2.0 license</a> .

‎_vale/Docker/Acronyms.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ exceptions:
4141
- ECI
4242
- ELK
4343
- FAQ
44+
- FPM
4445
- FUSE
4546
- GB
4647
- GCC

‎_vale/config/vocabularies/Docker/accept.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ JetBrains
5858
Kerberos
5959
Kitematic
6060
Kubernetes
61+
Laravel
62+
Laradock
6163
Linux
6264
LinuxKit
6365
Logstash
@@ -94,6 +96,7 @@ VMware
9496
Wasm
9597
Windows
9698
WireMock
99+
Xdebug
97100
Zscaler
98101
Zsh
99102
[Aa]nonymized?

‎_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md‎

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

‎_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md‎

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

‎_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md‎

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

‎_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml‎

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

‎_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml‎

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

‎_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml‎

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

0 commit comments

Comments
 (0)