Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions _vale/Docker/Acronyms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,29 @@ link: https://docs.docker.com/contribute/style/grammar/#acronyms-and-initialisms
level: warning
ignorecase: false
# Ensures that the existence of 'first' implies the existence of 'second'.
first: '\b([A-Z]{3,5})\b'
second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
first: '\b([A-Z]{2,5})\b'
second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
# ... with the exception of these:
exceptions:
- AGPL
- API
- ARM
- ASP
- AUFS
- AWS
- BIOS
- CISA
- CLI
- CNCF
- CORS
- CPU
- CSS
- CSV
- CVE
- DCT
- DEBUG
- DHCP
- DNS
- DOM
- DPI
- DSOS
Expand All @@ -32,53 +38,84 @@ exceptions:
- GDB
- GET
- GHSA
- GNU
- GPG
- GPL
- GPU
- GRUB
- GTK
- GUI
- HEAD
- HTML
- HTTP
- HTTPS
- IAM
- IDE
- IP
- JAR
- JSON
- JSX
- LESS
- LLDB
- LTS
- MAC
- MDM
- NAT
- NET
- NFS
- NOTE
- NTLM
- NVDA
- OCI
- OSS
- PATH
- PDF
- PEM
- PHP
- POSIX
- POST
- QEMU
- RAM
- REPL
- REST
- RHEL
- RPM
- RSA
- SAML
- SARIF
- SBOM
- SCIM
- SCM
- SCSS
- SDK
- SLES
- SLSA
- SPDX
- SQL
- SSD
- SSH
- SSL
- SSO
- SVG
- TBD
- TCP
- TCP
- TIP
- TLS
- TODO
- TTY
- TXT
- UDP
- URI
- URL
- USB
- USD
- UTF
- UUID
- VAT
- VLAN
- VM
- VPN
- WSL
- XML
- XSS
Expand Down
1 change: 1 addition & 0 deletions _vale/Docker/RecommendedWords.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ swap:
check box: checkbox
check boxes: checkboxes
click: select
distro: distribution
ergo: therefore
file name: filename
keypress: keystroke
Expand Down
60 changes: 5 additions & 55 deletions _vale/config/vocabularies/Docker/accept.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
A?GPL(v3)?
APIs?
ARM
AWS
(?-i)[A-Z]{2,}s
Admin Console
Amazon
Ambassador
Anchore
Apple
Artifactory
Expand All @@ -14,10 +10,6 @@ Azure
Btrfs
BuildKit
BusyBox
CISA
CNCF
CORS
CVEs?
CentOS
Ceph
Chrome
Expand All @@ -27,10 +19,6 @@ Codefresh
Codespaces
CouchDB
Couchbase
DHCP
DNS
DSOS
DVP
Datadog
Ddosify
Debootstrap
Expand All @@ -55,91 +43,52 @@ Ethernet
Fargate
Fedora
Flink
GPG
GPUs?
GRUB
GeoNetwork
Git
GitHub( Actions)?
Google
Grafana
Gravatar
HTTP
HyperKit
IAM
IPs?
IPv[46]
IPvlan
Intel
Intune
Jamf
JFrog
Jamf
JetBrains
Kerberos
[Kk]eyrings?
Kitematic
Kubernetes
LTS
Linux
LinuxKit
Logstash
MAC
Mac
Mail(chimp|gun)
MDM
Microsoft
MySQL
NAT
Netplan
Nginx
NTLM
Nuxeo
OAT
OAuth
OCI
OTel
Okta
PAT
PEM
Postgres
PowerShell
Python
QEMU
RHEL
RPM
S3
SAML
SARIF
SBOMs?
SCIM
SDKs?
SLES
SLSA
SPDX
SQLite
SSH
SSO
Slack
Snyk
Solr
SonarQube
Syft
Sysdig
TCP
TLS
TXT
Testcontainers
Traefik
UDP
URLs?
UUID
Ubuntu
Unix
VLAN
VM
VMware
VPN
WSL
Wasm
Windows
WireMock
Expand All @@ -148,12 +97,13 @@ Zsh
[Bb]uildx
[Cc]odenames?
[Cc]ompose
[Dd]istros
[Dd]istroless
[Ff]ilepaths?
[Ff]iletypes?
[GgCc]oroutine
[Hh]ostname
[Ii]nfosec
[Kk]eyrings?
[Ll]oopback
[Mm]oby
[Oo]nboarding
Expand All @@ -165,8 +115,8 @@ Zsh
[Ss]wappable
[Ss]warm
[Tt]oolchains?
[Vv]irtualize
[Vv]irtiofs
[Vv]irtualize
[Ww]alkthrough
cgroup
config
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/compose/install/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For Compose standalone, see [Install Compose Standalone](standalone.md).

## Install using the repository

1. Set up the repository. Find distro-specific instructions in:
1. Set up the repository. Find distribution-specific instructions in:

[Ubuntu](/manuals/engine/install/ubuntu.md#install-using-the-repository) |
[CentOS](/manuals/engine/install/centos.md#set-up-the-repository) |
Expand All @@ -43,7 +43,7 @@ For Compose standalone, see [Install Compose Standalone](standalone.md).
$ sudo apt-get update
$ sudo apt-get install docker-compose-plugin
```
* For RPM-based distros, run:
* For RPM-based distributions, run:

```console
$ sudo yum update
Expand Down Expand Up @@ -74,7 +74,7 @@ To update the Compose plugin, run the following commands:
$ sudo apt-get update
$ sudo apt-get install docker-compose-plugin
```
* For RPM-based distros, run:
* For RPM-based distributions, run:

```console
$ sudo yum update
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/compose/install/uninstall.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Ubuntu, Debian:
```console
$ sudo apt-get remove docker-compose-plugin
```
RPM-based distros:
RPM-based distributions:

```console
$ sudo yum remove docker-compose-plugin
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/compose/releases/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ For a list of PRs and issues fixed in this release, see [Compose 1.28.3](https:/

- Removed `None` entries on exec command.

- Added `distro` package to get distro information.
- Added `distribution` package to get distribution information.

- Added `python-dotenv` to delegate `.env` file processing.

Expand Down
18 changes: 9 additions & 9 deletions content/manuals/desktop/features/wsl/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
> If you want to change the location, for example, to another drive you can do so via the `Settings -> Resources -> Advanced` page from the Docker Dashboard.
> Read more about this and other Windows settings at [Changing settings](/manuals/desktop/settings-and-maintenance/settings.md)

## Enabling Docker support in WSL 2 distros
## Enabling Docker support in WSL 2 distributions

WSL 2 adds support for "Linux distros" to Windows, where each distro behaves like a VM except they all run on top of a single shared Linux kernel.
WSL 2 adds support for "Linux distributions" to Windows, where each distribution behaves like a VM except they all run on top of a single shared Linux kernel.

Docker Desktop does not require any particular Linux distros to be installed. The `docker` CLI and UI all work fine from Windows without any additional Linux distros. However for the best developer experience, we recommend installing at least one additional distro and enable Docker support:
Docker Desktop does not require any particular Linux distributions to be installed. The `docker` CLI and UI all work fine from Windows without any additional Linux distributions. However for the best developer experience, we recommend installing at least one additional distribution and enable Docker support:

Check warning on line 65 in content/manuals/desktop/features/wsl/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.Acronyms] 'UI' has no definition. Raw Output: {"message": "[Docker.Acronyms] 'UI' has no definition.", "location": {"path": "content/manuals/desktop/features/wsl/_index.md", "range": {"start": {"line": 65, "column": 106}}}, "severity": "WARNING"}

1. Ensure the distribution runs in WSL 2 mode. WSL can run distributions in both v1 or v2 mode.

Expand All @@ -72,10 +72,10 @@
$ wsl.exe -l -v
```

To upgrade the Linux distro to v2, run:
To upgrade the Linux distribution to v2, run:

```console
$ wsl.exe --set-version (distro name) 2
$ wsl.exe --set-version (distribution name) 2
```

To set v2 as the default version for future installations, run:
Expand All @@ -86,19 +86,19 @@

2. When Docker Desktop starts, go to **Settings** > **Resources** > **WSL Integration**.

The Docker-WSL integration is enabled on the default WSL distribution, which is [Ubuntu](https://learn.microsoft.com/en-us/windows/wsl/install). To change your default WSL distro, run:
The Docker-WSL integration is enabled on the default WSL distribution, which is [Ubuntu](https://learn.microsoft.com/en-us/windows/wsl/install). To change your default WSL distribution, run:
```console
$ wsl --set-default <distro name>
$ wsl --set-default <distribution name>
```

3. Select **Apply & Restart**.

> [!NOTE]
>
> With Docker Desktop version 4.30 and earlier, Docker Desktop installed two special-purpose internal Linux distros `docker-desktop` and `docker-desktop-data`. `docker-desktop` is used to run the Docker engine `dockerd`, while `docker-desktop-data` stores containers and images. Neither can be used for general development.
> With Docker Desktop version 4.30 and earlier, Docker Desktop installed two special-purpose internal Linux distributions `docker-desktop` and `docker-desktop-data`. `docker-desktop` is used to run the Docker engine `dockerd`, while `docker-desktop-data` stores containers and images. Neither can be used for general development.

Check failure on line 98 in content/manuals/desktop/features/wsl/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Vale.Terms] Use 'Docker Engine' instead of 'Docker engine'. Raw Output: {"message": "[Vale.Terms] Use 'Docker Engine' instead of 'Docker engine'.", "location": {"path": "content/manuals/desktop/features/wsl/_index.md", "range": {"start": {"line": 98, "column": 203}}}, "severity": "ERROR"}
>
> With fresh installations of Docker Desktop 4.30 and later, `docker-desktop-data` is no longer created. Instead, Docker Desktop creates and
> manages its own virtual hard disk for storage. The `docker-desktop` distro is still created and used to run the Docker engine.
> manages its own virtual hard disk for storage. The `docker-desktop` distribution is still created and used to run the Docker engine.

Check failure on line 101 in content/manuals/desktop/features/wsl/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Vale.Terms] Use 'Docker Engine' instead of 'Docker engine'. Raw Output: {"message": "[Vale.Terms] Use 'Docker Engine' instead of 'Docker engine'.", "location": {"path": "content/manuals/desktop/features/wsl/_index.md", "range": {"start": {"line": 101, "column": 121}}}, "severity": "ERROR"}
>
> Note that Docker Desktop version 4.30 and later keeps using the `docker-desktop-data` distribution if it was already created by an earlier version of Docker Desktop and has not been freshly installed or factory reset.

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/desktop/features/wsl/use-wsl.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
- /desktop/wsl/use-wsl/
---

The following section describes how to start developing your applications using Docker and WSL 2. We recommend that you have your code in your default Linux distribution for the best development experience using Docker and WSL 2. After you have turned on the WSL 2 feature on Docker Desktop, you can start working with your code inside the Linux distro and ideally with your IDE still in Windows. This workflow is straightforward if you are using [VS Code](https://code.visualstudio.com/download).
The following section describes how to start developing your applications using Docker and WSL 2. We recommend that you have your code in your default Linux distribution for the best development experience using Docker and WSL 2. After you have turned on the WSL 2 feature on Docker Desktop, you can start working with your code inside the Linux distribution and ideally with your IDE still in Windows. This workflow is straightforward if you are using [VS Code](https://code.visualstudio.com/download).

Check warning on line 9 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.We] Avoid using first-person plural like 'We'. Raw Output: {"message": "[Docker.We] Avoid using first-person plural like 'We'.", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 9, "column": 99}}}, "severity": "WARNING"}

Check warning on line 9 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.Acronyms] 'VS' has no definition. Raw Output: {"message": "[Docker.Acronyms] 'VS' has no definition.", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 9, "column": 455}}}, "severity": "WARNING"}

Check warning on line 9 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.RecommendedWords] Consider using 'versus' instead of 'VS' Raw Output: {"message": "[Docker.RecommendedWords] Consider using 'versus' instead of 'VS'", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 9, "column": 455}}}, "severity": "INFO"}

## Develop with Docker and WSL 2

1. Open VS Code and install the [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension. This extension lets you work with a remote server in the Linux distro and your IDE client still on Windows.
1. Open VS Code and install the [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension. This extension lets you work with a remote server in the Linux distribution and your IDE client still on Windows.

Check warning on line 13 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.RecommendedWords] Consider using 'versus' instead of 'VS' Raw Output: {"message": "[Docker.RecommendedWords] Consider using 'versus' instead of 'VS'", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 13, "column": 9}}}, "severity": "INFO"}

Check warning on line 13 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.Acronyms] 'VS' has no definition. Raw Output: {"message": "[Docker.Acronyms] 'VS' has no definition.", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 13, "column": 9}}}, "severity": "WARNING"}
2. Open your terminal and type:

```console
Expand All @@ -22,7 +22,7 @@
$ code .
```

This opens a new VS Code window connected remotely to your default Linux distro which you can check in the bottom corner of the screen.
This opens a new VS Code window connected remotely to your default Linux distribution which you can check in the bottom corner of the screen.

Check warning on line 25 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.Acronyms] 'VS' has no definition. Raw Output: {"message": "[Docker.Acronyms] 'VS' has no definition.", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 25, "column": 22}}}, "severity": "WARNING"}

Check warning on line 25 in content/manuals/desktop/features/wsl/use-wsl.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.RecommendedWords] Consider using 'versus' instead of 'VS' Raw Output: {"message": "[Docker.RecommendedWords] Consider using 'versus' instead of 'VS'", "location": {"path": "content/manuals/desktop/features/wsl/use-wsl.md", "range": {"start": {"line": 25, "column": 22}}}, "severity": "INFO"}


Alternatively, you can open your default Linux distribution from the **Start** menu, navigate to your project directory, and then run `code .`
Expand Down
Loading
Loading