docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #868 from docker/fix-md-fips 

Escaped {{ }} in command output in FIPS.
This commit is contained in:
Justin I. Nevill 2018-11-07 15:35:07 -05:00 committed by GitHub
parent d63a1e201e c158840bac
commit 2fab90359b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/release-notes.md
View File

@ -1387,9 +1387,9 @@ Initial Docker EE release, based on Docker CE 17.03.0
+ Add support for update order in compose deployments [docker/cli#360](https://github.com/docker/cli/pull/360)
+ Add ulimits to unsupported compose fields [docker/cli#482](https://github.com/docker/cli/pull/482)
+ Add `--format` to `docker-search` [docker/cli#440](https://github.com/docker/cli/pull/440)
* Show images digests when `{{.Digest}}` is in format [docker/cli#439](https://github.com/docker/cli/pull/439)
* Show images digests when {% raw %}`{{.Digest}}`{% endraw %} is in format [docker/cli#439](https://github.com/docker/cli/pull/439)
* Print output of `docker stack rm` on `stdout` instead of `stderr` [docker/cli#491](https://github.com/docker/cli/pull/491)
- Fix `docker history --format {{json .}}'` printing human-readable timestamps instead of ISO8601 when `--human=true` [docker/cli#438](https://github.com/docker/cli/pull/438)
- Fix {% raw %}`docker history --format {{json .}}`{% endraw %} printing human-readable timestamps instead of ISO8601 when `--human=true` [docker/cli#438](https://github.com/docker/cli/pull/438)
- Fix idempotence of `docker stack deploy` when secrets or configs are used [docker/cli#509](https://github.com/docker/cli/pull/509)
- Fix presentation of random host ports [docker/cli#404](https://github.com/docker/cli/pull/404)
- Fix redundant service restarts when service created with multiple secrets [moby/moby#34746](https://github.com/moby/moby/issues/34746)

4
install/linux/docker-ee/rhel.md
View File

@ -78,10 +78,12 @@ Restart the Docker service as root.
To confirm Docker is running with FIPS-140-2 enabled, run the `docker info` command:
{% raw %}
```
$ docker info --format '{{ .SecurityOptions }}'
docker info --format {{.SecurityOptions}}
[name=selinux name=fips]
```
{% endraw %}
### Disabling FIPS-140-2