Merge pull request #25588 from thaJeztah/fix-events-since-description
Fix events "since" query parameter description
(cherry picked from commit 960b7de456
)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
This commit is contained in:
parent
7cee444f8b
commit
006f50ae27
7 changed files with 21 additions and 25 deletions
|
@ -1735,8 +1735,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via
|
Get container events from docker, in real time via streaming.
|
||||||
polling (using since).
|
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -1762,8 +1761,8 @@ and Docker images report:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -1816,8 +1816,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via
|
Get container events from docker, in real time via streaming.
|
||||||
polling (using since).
|
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -1843,8 +1842,8 @@ and Docker images report:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -1960,8 +1960,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via
|
Get container events from docker, in real time via streaming.
|
||||||
polling (using since).
|
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -1987,8 +1986,8 @@ and Docker images report:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -2110,8 +2110,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via
|
Get container events from docker, in real time via streaming.
|
||||||
polling (using since).
|
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -2137,8 +2136,8 @@ and Docker images report:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -2343,7 +2343,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via polling (using since).
|
Get container events from docker, in real time via streaming.
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -2523,8 +2523,8 @@ Docker networks report the following events:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -2388,7 +2388,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via polling (using since).
|
Get container events from docker, in real time via streaming.
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -2568,8 +2568,8 @@ Docker networks report the following events:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
|
@ -2396,7 +2396,7 @@ Create a new image from a container's changes
|
||||||
|
|
||||||
`GET /events`
|
`GET /events`
|
||||||
|
|
||||||
Get container events from docker, either in real time via streaming, or via polling (using since).
|
Get container events from docker, in real time via streaming.
|
||||||
|
|
||||||
Docker containers report the following events:
|
Docker containers report the following events:
|
||||||
|
|
||||||
|
@ -2580,8 +2580,8 @@ Docker daemon report the following event:
|
||||||
|
|
||||||
**Query parameters**:
|
**Query parameters**:
|
||||||
|
|
||||||
- **since** – Timestamp used for polling
|
- **since** – Timestamp. Show all events created since timestamp and then stream
|
||||||
- **until** – Timestamp used for polling
|
- **until** – Timestamp. Show events created until given timestamp and stop streaming
|
||||||
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
- **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
|
||||||
- `container=<string>`; -- container to filter
|
- `container=<string>`; -- container to filter
|
||||||
- `event=<string>`; -- event to filter
|
- `event=<string>`; -- event to filter
|
||||||
|
|
Loading…
Reference in a new issue