Commit Graph

50157 Commits

Author SHA1 Message Date
L-Hudson c886d6d593
Merge pull request #7801 from jonpspri/patch-1
Update https.cnf - Clarify extfile directions
2018-12-07 15:48:24 -05:00
L-Hudson 06761fda2d
Merge pull request #7789 from raunakkathuria/patch-1
Update port mapping 4000 to 80 for consistency
2018-12-07 15:45:43 -05:00
L-Hudson dcb820da4b
Merge pull request #7799 from JeffUnderhill/patch-1
Update index.md to correctly reflect aarch64 OS
2018-12-07 15:41:01 -05:00
L-Hudson 43a1cb05a4
Update https.md
editorial crx
2018-12-07 15:39:01 -05:00
L-Hudson c4ad30981f
Merge pull request #7813 from gtardif/release_notes_2.0.0.0-win81
Release notes for 2.0.0.0-win81 (Stable) cc @gbarr01
2018-12-07 15:06:23 -05:00
L-Hudson cca2e15ff5
Merge pull request #7814 from gtardif/release_notes_2.0.0.0-mac81
Release notes for 2.0.0.0-mac81 (Stable) cc @gbarr01
2018-12-07 15:05:26 -05:00
L-Hudson d22c46417e
Merge pull request #7816 from gtardif/release_notes_2.0.0.0-win82
Release notes for 2.0.0.0-win82 (Edge) cc @gbarr01
2018-12-07 15:03:56 -05:00
L-Hudson 7cd278786e
Merge pull request #7817 from gtardif/release_notes_2.0.0.0-mac82
Release notes for 2.0.0.0-mac82 (Edge) cc @gbarr01
2018-12-07 14:59:42 -05:00
L-Hudson 3a5c53b626
Merge pull request #7818 from WeJie/patch-3
Fix wrong command
2018-12-07 14:58:20 -05:00
L-Hudson 1eb0ebfac6
Merge pull request #7648 from ollypom/ucp-config-31
Updated UCP 3.1 Config Reference
2018-12-07 14:29:06 -05:00
L-Hudson 47022898e0
Update ucp-configuration-file.md
editorial crx
2018-12-07 13:53:16 -05:00
Jeff Underhill 1b5dd00c63
Merge branch 'master' into patch-1 2018-12-07 09:10:43 -08:00
Anne Henmi 539815d885
Merge pull request #7729 from thaJeztah/update_api_matrix
Update API version matrix for 18.06 and 18.09
2018-12-07 10:05:55 -07:00
L-Hudson 9a1595ad6a
Merge pull request #7783 from link2xt/patch-1
Remove .md suffix from URLs
2018-12-07 10:29:03 -05:00
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
L-Hudson bd54196ec5
Merge pull request #7806 from ollypom/311-offline-bundles
Added UCP 3.1.1 and 3.0.7 Offline Bundles
2018-12-07 09:49:53 -05:00
L-Hudson 6254a0aabc
Merge pull request #7792 from colek42/patch-1
Add UCP 3.1 to list of artifacts
2018-12-07 09:48:38 -05:00
L-Hudson 958fa33467
Merge pull request #7808 from docker/docker-dtr-cli
Fix example usage
2018-12-07 09:47:33 -05:00
L-Hudson 851b568967
Merge pull request #7774 from docker/manage-images-891
Manage images 891
2018-12-07 09:23:10 -05:00
Jenkins-pr-release-docs 74c9a3192a Docker for mac edge relnotes 2.0.0.0-mac82
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-12-07 14:09:27 +00:00
Jenkins-pr-release-docs 4dbaf35bf6 Docker for win edge relnotes 2.0.0.0-win82
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-12-07 14:01:56 +00:00
L-Hudson cb985989ba
Update pull-and-push-images.md
edits typo
2018-12-07 08:52:22 -05:00
L-Hudson 21ba045126
Update override-a-vulnerability.md
edit UI > interface
2018-12-07 08:51:33 -05:00
Jenkins-pr-release-docs 22c8b9c652 Docker for mac stable relnotes 2.0.0.0-mac81
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-12-07 09:20:43 +00:00
Jenkins-pr-release-docs d870bf1da5 Docker for win stable relnotes 2.0.0.0-win81
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-12-07 09:17:51 +00:00
Maria Bermudez 25ec0145b3
Fix example usage 2018-12-06 15:51:53 -08:00
L-Hudson 96ce9aba7c
Merge pull request #7353 from ollypom/dockeree-azuredocs
Added Azure Config File
2018-12-06 16:51:01 -05:00
L-Hudson 22c3a4ccd6
Update upgrade.md
editorial crx
2018-12-06 16:39:36 -05:00
L-Hudson c2ee54bc8f
Update install-on-azure.md
editorial crx
2018-12-06 16:35:06 -05:00
L-Hudson 736bc25419
Update install-on-azure.md
editorial crx
2018-12-06 16:07:39 -05:00
ollypom 740acf7cfc missed 1803 2018-12-06 20:47:53 +00:00
ollypom 3fdad0dfa7 Added UCP 3.1.1 Offline Bundles 2018-12-06 20:43:13 +00: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
Jeff Underhill 5c7fe9a864
Update index.md to correctly reflect aarch64 OS
Per the script @ https://get.docker.com/ aarch64 is supported on Ubuntu, Debian, fedora & CentOS but the table on this page didn't correctly represent the fedora support. This change adds that check mark to the fedora row in the aarch64 column
2018-12-05 20:35:30 -08:00
Anne Henmi 3154a93123
Merge pull request #7776 from WeJie/patch-2
Get some miss content back from commit history
2018-12-05 16:06:56 -07:00
Maria Bermudez 401b8652a6 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-05 12:44:12 -08:00
Maria Bermudez 850014d441 Resolving merge conflicts 2018-12-05 12:44:04 -08:00
Maria Bermudez f57e7c226b Merge branch 'JoeWrightss-patch-1' 2018-12-05 12:39:35 -08:00
L-Hudson 0bacb51117
Merge pull request #7680 from gtardif/release_notes_2.0.0.0-mac77
Release notes for 2.0.0.0-mac77 (Edge) cc @gbarr01
2018-12-05 14:57:19 -05:00
Maria Bermudez d390968e49
Merge pull request #2 from docker/master
Sync fork with docker/docker.github.io
2018-12-05 11:55:40 -08:00
L-Hudson 4563b7ea48
Update edge-release-notes.md
Editorial fixes
2018-12-05 14:45:55 -05:00
Maria Bermudez 5b2ef74da6 Merge branch 'patch-1' of git://github.com/JoeWrightss/docker.github.io into JoeWrightss-patch-1 2018-12-05 11:38:11 -08:00
L-Hudson dc64b6a1a5
Merge pull request #7681 from gtardif/release_notes_2.0.0.0-win77
Release notes for 2.0.0.0-win77 (Edge) cc @gbarr01
2018-12-05 10:24:12 -05:00
L-Hudson 0e435008ce
Update edge-release-notes.md
editorial changes for consistency and readability
2018-12-05 10:09:56 -05:00
Maria Bermudez be75aa5310
Merge pull request #7788 from EdgarBarrantes/patch-1
Fix typo
2018-12-04 15:56:28 -08:00
Cole Kennedy d42c525bd3
Add UCP 3.1 to list of artifacts 2018-12-04 15:15:42 -05:00
Justin I. Nevill 1da11ad7fc
Merge pull request #7791 from docker/CVE-2018-1002105
CVE-2018-1002105 UCP release notes for 3.1.1 and 3.0.7.
2018-12-04 20:01:41 +01:00
Anne Henmi d027031565
Update release-notes.md
Added kube version.
2018-12-04 11:53:02 -07:00
Anne Henmi 557b1a12b3 Added line for UCP release notes for 3.1.1 and 3.0.7. 2018-12-04 11:43:53 -07:00
L-Hudson 7e064bb565
Merge pull request #7719 from gtardif/release_notes_2.0.0.0-win78
Release notes for 2.0.0.0-win78 (Stable) cc @gbarr01
2018-12-04 09:56:56 -05:00