Skip to content

Commit 7b63045

Browse files
authored
Merge pull request #5437 from thaJeztah/remove_deprecated_cors_headers
docs, man: dockerd: remove --api-cors-header (deprecated)
2 parents ccc87eb + 1a0e320 commit 7b63045

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

docs/deprecated.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following table provides an overview of the current status of deprecated fea
5454
| Status | Feature | Deprecated | Remove |
5555
|------------|------------------------------------------------------------------------------------------------------------------------------------|------------|--------|
5656
| Deprecated | [Non-standard fields in image inspect](#non-standard-fields-in-image-inspect) | v27.0 | v28.0 |
57-
| Deprecated | [API CORS headers](#api-cors-headers) | v27.0 | v28.0 |
57+
| Removed | [API CORS headers](#api-cors-headers) | v27.0 | v28.0 |
5858
| Deprecated | [Graphdriver plugins (experimental)](#graphdriver-plugins-experimental) | v27.0 | v28.0 |
5959
| Deprecated | [Unauthenticated TCP connections](#unauthenticated-tcp-connections) | v26.0 | v28.0 |
6060
| Deprecated | [`Container` and `ContainerConfig` fields in Image inspect](#container-and-containerconfig-fields-in-image-inspect) | v25.0 | v26.0 |
@@ -177,18 +177,19 @@ and a custom [snapshotter](https://github.com/containerd/containerd/tree/v1.7.18
177177
### API CORS headers
178178

179179
**Deprecated in Release: v27.0**
180-
**Target For Removal In Release: v28.0**
180+
**Disabled by default in Release: v27.0**
181+
**Removed in release: v28.0**
181182

182183
The `api-cors-header` configuration option for the Docker daemon is insecure,
183184
and is therefore deprecated and scheduled for removal.
184185
Incorrectly setting this option could leave a window of opportunity
185186
for unauthenticated cross-origin requests to be accepted by the daemon.
186187

187-
Starting in Docker Engine v27.0, this flag can still be set,
188+
In Docker Engine v27.0, this flag can still be set,
188189
but it has no effect unless the environment variable
189190
`DOCKERD_DEPRECATED_CORS_HEADER` is also set to a non-empty value.
190191

191-
This flag will be removed altogether in v28.0.
192+
This flag has been removed altogether in v28.0.
192193

193194
This is a breaking change for authorization plugins and other programs
194195
that depend on this option for accessing the Docker API from a browser.

docs/reference/dockerd.md

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ A self-sufficient runtime for containers.
2525
Options:
2626
--add-runtime runtime Register an additional OCI compatible runtime (default [])
2727
--allow-nondistributable-artifacts list Allow push of nondistributable artifacts to registry
28-
--api-cors-header string Set CORS headers in the Engine API
2928
--authorization-plugin list Authorization plugins to load
3029
--bip string Specify network bridge IP
3130
-b, --bridge string Attach containers to a network bridge
@@ -1074,7 +1073,6 @@ The following is a full example of the allowed configuration options on Linux:
10741073
```json
10751074
{
10761075
"allow-nondistributable-artifacts": [],
1077-
"api-cors-header": "",
10781076
"authorization-plugins": [],
10791077
"bip": "",
10801078
"bridge": "",

man/dockerd.8.md

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dockerd - Enable daemon mode
77
**dockerd**
88
[**--add-runtime**[=*[]*]]
99
[**--allow-nondistributable-artifacts**[=*[]*]]
10-
[**--api-cors-header**=[=*API-CORS-HEADER*]]
1110
[**--authorization-plugin**[=*[]*]]
1211
[**-b**|**--bridge**[=*BRIDGE*]]
1312
[**--bip**[=*BIP*]]
@@ -138,10 +137,6 @@ $ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-ru
138137
artifacts to private registries and ensure that you are in compliance with
139138
any terms that cover redistributing nondistributable artifacts.
140139

141-
**--api-cors-header**=""
142-
Set CORS headers in the Engine API. Default is cors disabled. Give urls like
143-
"http://foo, http://bar, ...". Give "\*" to allow all.
144-
145140
**--authorization-plugin**=""
146141
Set authorization plugins to load
147142

0 commit comments

Comments
 (0)