Skip to content

Commit 68ec5bf

Browse files
authored
Merge pull request #6559 from thaJeztah/fix_filteropts_default
opts: FilterOpt: show empty string if no values are set
2 parents ecea0c0 + e6d150b commit 68ec5bf

25 files changed

+27
-24
lines changed

docs/reference/commandline/builder_prune.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Remove build cache
88
| Name | Type | Default | Description |
99
|:-----------------|:---------|:--------|:------------------------------------------------------|
1010
| `-a`, `--all` | `bool` | | Remove all unused build cache, not just dangling ones |
11-
| `--filter` | `filter` | `{}` | Provide filter values (e.g. `until=24h`) |
11+
| `--filter` | `filter` | | Provide filter values (e.g. `until=24h`) |
1212
| `-f`, `--force` | `bool` | | Do not prompt for confirmation |
1313
| `--keep-storage` | `bytes` | `0` | Amount of disk space to keep for cache |
1414

docs/reference/commandline/config_ls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ List configs
1111

1212
| Name | Type | Default | Description |
1313
|:---------------------------------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
14-
| [`-f`](#filter), [`--filter`](#filter) | `filter` | `{}` | Filter output based on conditions provided |
14+
| [`-f`](#filter), [`--filter`](#filter) | `filter` | | Filter output based on conditions provided |
1515
| [`--format`](#format) | `string` | | Format output using a custom template:<br>'table': Print output in table format with column headers (default)<br>'table TEMPLATE': Print output in table format using the given Go template<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates |
1616
| `-q`, `--quiet` | `bool` | | Only display IDs |
1717

docs/reference/commandline/container_ls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ List containers
1212
| Name | Type | Default | Description |
1313
|:---------------------------------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1414
| [`-a`](#all), [`--all`](#all) | `bool` | | Show all containers (default shows just running) |
15-
| [`-f`](#filter), [`--filter`](#filter) | `filter` | `{}` | Filter output based on conditions provided |
15+
| [`-f`](#filter), [`--filter`](#filter) | `filter` | | Filter output based on conditions provided |
1616
| [`--format`](#format) | `string` | | Format output using a custom template:<br>'table': Print output in table format with column headers (default)<br>'table TEMPLATE': Print output in table format using the given Go template<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates |
1717
| `-n`, `--last` | `int` | `-1` | Show n last created containers (includes all states) |
1818
| `-l`, `--latest` | `bool` | | Show the latest created container (includes all states) |

docs/reference/commandline/container_prune.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Remove all stopped containers
77

88
| Name | Type | Default | Description |
99
|:----------------------|:---------|:--------|:-------------------------------------------------|
10-
| [`--filter`](#filter) | `filter` | `{}` | Provide filter values (e.g. `until=<timestamp>`) |
10+
| [`--filter`](#filter) | `filter` | | Provide filter values (e.g. `until=<timestamp>`) |
1111
| `-f`, `--force` | `bool` | | Do not prompt for confirmation |
1212

1313

docs/reference/commandline/events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Get real time events from the server
1111

1212
| Name | Type | Default | Description |
1313
|:-----------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
14-
| `-f`, `--filter` | `filter` | `{}` | Filter output based on conditions provided |
14+
| `-f`, `--filter` | `filter` | | Filter output based on conditions provided |
1515
| `--format` | `string` | | Format output using a custom template:<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates |
1616
| `--since` | `string` | | Show all events created since timestamp |
1717
| `--until` | `string` | | Stream events until this timestamp |

docs/reference/commandline/image_ls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ List images
1313
|:---------------------------------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1414
| `-a`, `--all` | `bool` | | Show all images (default hides intermediate images) |
1515
| [`--digests`](#digests) | `bool` | | Show digests |
16-
| [`-f`](#filter), [`--filter`](#filter) | `filter` | `{}` | Filter output based on conditions provided |
16+
| [`-f`](#filter), [`--filter`](#filter) | `filter` | | Filter output based on conditions provided |
1717
| [`--format`](#format) | `string` | | Format output using a custom template:<br>'table': Print output in table format with column headers (default)<br>'table TEMPLATE': Print output in table format using the given Go template<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates |
1818
| [`--no-trunc`](#no-trunc) | `bool` | | Don't truncate output |
1919
| `-q`, `--quiet` | `bool` | | Only show image IDs |

docs/reference/commandline/image_prune.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Remove unused images
88
| Name | Type | Default | Description |
99
|:----------------------|:---------|:--------|:-------------------------------------------------|
1010
| `-a`, `--all` | `bool` | | Remove all unused images, not just dangling ones |
11-
| [`--filter`](#filter) | `filter` | `{}` | Provide filter values (e.g. `until=<timestamp>`) |
11+
| [`--filter`](#filter) | `filter` | | Provide filter values (e.g. `until=<timestamp>`) |
1212
| `-f`, `--force` | `bool` | | Do not prompt for confirmation |
1313

1414

docs/reference/commandline/images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ List images
1313
|:-----------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1414
| `-a`, `--all` | `bool` | | Show all images (default hides intermediate images) |
1515
| `--digests` | `bool` | | Show digests |
16-
| `-f`, `--filter` | `filter` | `{}` | Filter output based on conditions provided |
16+
| `-f`, `--filter` | `filter` | | Filter output based on conditions provided |
1717
| `--format` | `string` | | Format output using a custom template:<br>'table': Print output in table format with column headers (default)<br>'table TEMPLATE': Print output in table format using the given Go template<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates |
1818
| `--no-trunc` | `bool` | | Don't truncate output |
1919
| `-q`, `--quiet` | `bool` | | Only show image IDs |

0 commit comments

Comments
 (0)