Commit Graph

1594 Commits

Author SHA1 Message Date
WeJie 4d67e28b63
Fix wrong command
Should use ` docker service ps nginx` verify the nginx service is fully re-deployed, not `docker service ls nginx`.
2018-12-07 23:22:46 +08:00
Jonathan Springer 9f22f38fa7
Update https.cnf - Clarify extfile directions
Directions around `extfile.cnf` for client certificates was somewhat confusing.  Edited the document to clarify that a separate file was to be created, not append a line to the file that had just been created for the server.
2018-12-06 09:12:55 -05:00
Anne Henmi 71f0dc086c Fixed merge conflict in engine/release-notes.md.
Merge branch 'master' of github.com:docker/docker.github.io
2018-12-05 16:15:41 -07:00
Jeffrey Morgan 5cdb36d5a1 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-03 15:14:51 -05:00
WeJie d63986a46f
Get some miss content back from commit history 2018-12-02 16:19:42 +08:00
Eli Uriegas f65288b5fe Update moby/moby to docker/cli
The cli repository is its own thing now

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-11-30 19:06:31 +00:00
Jeffrey Morgan dacad06fbd Merge branch 'master' into consolidation-changes 2018-11-19 15:41:14 -05:00
thaim 1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Jasmin Young 78577e776f
Update release-notes.md
Requesting changes to release notes to add 17.06.2-ee-17 per: https://github.com/docker/docker-ee/releases/tag/v17.06.2-ee-17. Addtl reference: 7c0fb4a3e3
2018-11-15 11:03:28 -05:00
Jeffrey Morgan ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Sujay Pillai 277697e3cb
Update ce-ee-node-activate.md
Updated `docker version` info before and after activation. The engine server has the label "Community" [while using CE] and "Enterprise" after activation.
2018-11-09 14:26:29 +08:00
Darwin Traver e1390a2c53
Typo
Minor typo (bracket needed)
2018-11-08 12:03:10 -05:00
Justin I. Nevill a28d9d8eda
fixed enterpirse 2018-11-07 20:48:53 -05:00
Justin I. Nevill 87a18d5a4c
fixed redirects 2018-11-07 20:44:51 -05:00
Justin I. Nevill 420a1ef836
Update release-notes.md 2018-11-07 20:41:42 -05:00
Maria Bermudez 720b2e8680
Spelling fix 2018-11-07 16:36:48 -08:00
Justin I. Nevill 758952785a
HTML -> MD table w/ fixes 2018-11-07 19:31:39 -05:00
Maria Bermudez 4da484fbe8
Update content_trust.md
Converted table to markdown
2018-11-07 15:56:20 -08:00
Anne Henmi 1755ede5d9
Update content_trust.md
Fixed closing </table> tag.
2018-11-07 15:34:46 -08:00
Justin I. Nevill 2fab90359b
Merge pull request #868 from docker/fix-md-fips
Escaped {{ }} in command output in FIPS.
2018-11-07 15:35:07 -05:00
Maria Bermudez c158840bac Final Go template fixes 2018-11-07 12:30:47 -08:00
Anne Henmi a7e7f2e89a
Update content_trust.md 2018-11-07 10:17:27 -08:00
Anne Henmi ff81152728
Update content_trust.md 2018-11-07 10:16:52 -08:00
Anne Henmi 2791870005
Update content_trust.md 2018-11-07 10:16:11 -08:00
Anne Henmi e87a26decc
Update content_trust.md 2018-11-07 10:11:23 -08:00
Anne Henmi d32723440e
Update content_trust.md 2018-11-07 10:09:17 -08:00
Anne Henmi 902c115d4d
Update content_trust.md 2018-11-07 10:04:44 -08:00
Anne Henmi 36fd87206c
Update content_trust.md 2018-11-07 10:01:22 -08:00
Anne Henmi 2a449f3886 Fixed table, hopefully. 2018-11-07 09:58:57 -08:00
Justin I. Nevill 002c72e75c
Merge pull request #862 from docker/fix-header-grc
Fix merge conflicts in engine relnotes
2018-11-07 12:15:23 -05:00
Justin I. Nevill f70b3589ad
Merge pull request #860 from docker/dtr-ee-upgrade
Dtr ee upgrade
2018-11-06 19:36:48 -05:00
Anne Henmi 03fc305663 Removed merge conflict droppings and cleaned up a bit of formatting. 2018-11-06 14:09:04 -08:00
Maria Bermudez 1cdb109de0 Add new directories for Engine API versions 2018-11-06 13:02:43 -08:00
Maria Bermudez a2c83bf5cd Add best practices info for DTR upgrade, fix spelling issue on Engine release notes 2018-11-06 10:23:23 -08:00
Anne Henmi 9d5dbc0f86 Merge branch 'master' into combine-eng-relnotes-737 2018-11-05 07:27:47 -07:00
Justin I. Nevill d393a90309
Merge pull request #844 from docker/beta-cleanup
Removed Beta disclaimer tags
2018-11-04 13:32:21 -05:00
Anne Henmi 4b41db68a8
Update release-notes.md 2018-11-02 14:29:15 -06:00
Maria Bermudez d7a21d29db Merge public:master into private 2018-11-02 10:03:18 -07:00
Anne Henmi 9417008906 Last of the files. 2018-11-02 09:28:22 -06:00
Anne Henmi 61fa19ba77 Removed more beta tags 2018-11-02 09:24:30 -06:00
Anne Henmi 111a634a3a
Update release-notes.md
Added back device mapper deprecation notice that was accidently removed.
2018-11-01 15:13:54 -06:00
Anne Henmi 31feb053c4 Merge branch 'combine-eng-relnotes-737' of github.com:docker/docs-private into combine-eng-relnotes-737 2018-11-01 14:29:40 -06:00
Anne Henmi d54c80e7bc Added Mark Church's caveat for upgrades https://github.com/docker/docs-private/pull/836 2018-11-01 14:11:34 -06:00
uday-shetty 5c54fe723d added Oracle Linux 2018-10-31 17:30:54 -07:00
Anne Henmi b7f8750c97
Update release-notes.md
removed aufs deprecation notice.
2018-10-31 14:59:44 -06:00
Anne Henmi 06171ef993
Update release-notes.md
Added EOL header, moved overlay2 and deprecation notice above it.
2018-10-31 10:50:36 -06:00
Anne Henmi f6499a5c15
Update release-notes.md
Added aufs deprecation notice.
2018-10-30 08:48:25 -06:00
Jan Vorwerk f045723263 Document side effect on the --userns=host flag (#7537)
* Document  side effect on the --userns=host flag

As explained in https://github.com/moby/moby/issues/34064#issuecomment-430985552

* Fixed typos & added reference to binaries with the setuid flag
2018-10-30 12:29:59 +01:00
Anne Henmi 1e526c4b06
Update release-notes.md 2018-10-29 17:13:53 -06:00
Anne Henmi d14fd01f5d
Update release-notes.md 2018-10-29 17:06:55 -06:00
Anne Henmi 0e8b0002b3 Made fixes based on 55a55ecfd7/CHANGELOG.md per @thajeztah 2018-10-29 11:13:15 -06:00
Anne Henmi f6975b40d2 Added in all the notes from https://gist.github.com/thaJeztah/7b03ec5583a827af9d916fd8c3e236af 2018-10-29 08:57:51 -06:00
Anne Henmi 45277e483f Added logging section 2018-10-26 15:31:26 -06:00
Anne Henmi 338bf56050 Adding from https://gist.github.com/thaJeztah/7b03ec5583a827af9d916fd8c3e236af. Currently up to Windows. 2018-10-26 15:00:32 -06:00
Justin I. Nevill a8659a4bb9
Merge pull request #796 from docker/dct-plugin-675
DCT plugin 675
2018-10-26 14:22:33 -04:00
Anne Henmi 61df683f6f Merge branch 'combine-eng-relnotes-737' of github.com:docker/docs-private into combine-eng-relnotes-737 2018-10-26 10:51:49 -06:00
Anne Henmi c81f66ca86 Fixing dates. 2018-10-26 10:51:26 -06:00
Anne Henmi 2bd37cdfc5
Update release-notes.md 2018-10-25 15:45:51 -06:00
Anne Henmi b31e1e18e6
Update release-notes.md
Added hyperlinks, moved CE-EE node activate to the bottom of the list.
2018-10-25 15:35:10 -06:00
Anne Henmi 3a5538dd99
Update content_trust.md
Incorporated @ddeyo's feedback
2018-10-25 15:28:19 -06:00
Anne Henmi 5fc2b29768
Update security.md
Incorporated @ddeyo's fixes
2018-10-25 15:23:30 -06:00
Anne Henmi 75e3c4de87
Update content_trust.md 2018-10-25 13:19:03 -06:00
Anne Henmi 3b86535170
Update security.md 2018-10-25 13:16:13 -06:00
Anne Henmi 02e4a4a70a
Update release-notes.md
PM fixes incorporated.
2018-10-25 13:09:42 -06:00
Anne Henmi 3add4ac5e2 Merge branch 'combine-eng-relnotes-737' of github.com:docker/docs-private into combine-eng-relnotes-737 2018-10-25 10:50:12 -06:00
Anne Henmi a910eab327 Fixed all the headers in the older relnotes so they're one level down to not interfer with the new stuff. 2018-10-25 10:49:23 -06:00
Anne Henmi 912ef02be3
Update release-notes.md 2018-10-24 22:30:43 -06:00
Justin I. Nevill af40416cb8
Merge pull request #694 from docker/node-activate-673
CE-EE Node Activate
2018-10-24 11:29:56 -04:00
Anne Henmi 32d060a1f3
Update ce-ee-node-activate.md 2018-10-24 09:27:56 -06:00
Anne Henmi d9599eb932
Update ce-ee-node-activate.md 2018-10-24 09:22:39 -06:00
Anne Henmi 02690e50ca
Update ce-ee-node-activate.md 2018-10-24 09:20:04 -06:00
Anne Henmi e04e33bf7c Updated deprecation notice based on details from PM. 2018-10-24 07:41:51 -06:00
Anne Henmi 39412148bc Start of Release Notes for EE/CE 18.09 2018-10-23 20:24:27 -06:00
Anne Henmi ee2172416f
Update content_trust.md 2018-10-22 16:39:25 -06:00
Anne Henmi 7cc1c3955a
Update content_trust.md
Partial incorporation of @jamesonhyde-docker's comments. Waiting for clarification on the rest.
2018-10-22 15:18:36 -06:00
Anne Henmi 503eb170b7
Update security.md
incorporated @jamesonhyde-docker's feedback.
2018-10-22 14:56:32 -06:00
Anne Henmi b50b063a67
Update ce-ee-node-activate.md 2018-10-22 11:25:41 -06:00
Anne Henmi 8a86c77bfd
Update ce-ee-node-activate.md
Incorporated @bermudezmt's fixes.
2018-10-22 08:45:34 -06:00
Anne Henmi 5064765733 Added more on verification. 2018-10-19 08:09:29 -06:00
Anne Henmi bcf2835e83 Initial draft for user/dockerd/daemon.json complete. Need to check API docs before review. 2018-10-18 10:31:18 -06:00
Steve Smith 4f51e3a8ed
It's "on premises" not "on premise" 2018-10-18 12:18:53 -04:00
Anne Henmi ea19cdbe08 More table fun. 2018-10-18 09:47:34 -06:00
Anne Henmi f415a1de99 Fixed formatting, cleaning up text a bit. 2018-10-18 09:43:45 -06:00
Anne Henmi 3397e5129c More table formatting fun. 2018-10-17 09:02:23 -06:00
Anne Henmi 1ba6e4f414 Fixed formatting, added another row for testing before completing table. 2018-10-17 09:00:03 -06:00
Anne Henmi c9296ab1c9 fixed table, again. 2018-10-17 08:53:05 -06:00
Anne Henmi e7202bbfc4 Fixed table column 2018-10-17 08:50:17 -06:00
Anne Henmi 6f8524d5fc Started working on the detailed content for the DCT plugin. 2018-10-17 08:48:40 -06:00
Anne Henmi bf9ed86856 Added more explanation, cleaned up wording. 2018-10-16 19:50:20 -06:00
Anne Henmi 1155d53225 Testing rebase. 2018-10-16 19:32:03 -06:00
Anne Henmi ddc2bb4e11 Added x-ref 2018-10-16 19:23:32 -06:00
Anne Henmi 15a8fcd60b Added x-ref. 2018-10-16 19:22:22 -06:00
Anne Henmi 6e00f1eb82 Initial blurb on engine signature verification 2018-10-16 19:15:32 -06:00
Anne Henmi 28fbdab78c
Update ce-ee-node-activate.md
Fixed --license output per @davidwilliamson and fixed root prompts (changed to $).
2018-10-16 10:21:44 -06:00
Anne Henmi c3efcdd0a4
Update ce-ee-node-activate.md
Removed Red Hat Linux per @andrewhsu
2018-10-16 10:19:40 -06:00
Anne Henmi 69aa7d395d
Update join-nodes.md
Incorporated @JustinINevill's feedback.
2018-10-16 08:55:58 -06:00
Anne Henmi fc9fdb01ac
Update join-nodes.md
Added in @andrewhsu's feedback.
2018-10-15 15:07:45 -06:00
Anne Henmi 7de1b2033e
Update join-nodes.md
Added beta tag.
2018-10-10 10:49:01 -06:00
Anne Henmi 03e3c4dd51
Update join-nodes.md 2018-10-10 10:43:49 -06:00