docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
48,981 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

48981 Commits

Author SHA1 Message Date
ddeyo 320c1dd9b6 typo fixed 2018-09-10 10:41:44 -07:00
ddeyo 15287e52b9 updated to bump Kubernetes version support 2018-09-10 09:21:35 -07:00
ddeyo 51cc295a94 Kubernetes version updated 2018-09-10 09:01:49 -07:00
Maria Bermudez 37246102e9 Merge branch 'master' of https://github.com/docker/docker.github.io 2018-08-30 11:44:47 -07:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 4c95d161ca.
 2018-08-29 19:01:03 -07:00
Maria Bermudez 3eaf2afbf2 Revert "Adding period to confirmation message" 
This reverts commit 338b690d26.
 2018-08-29 18:38:21 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 14080c18bd.
 2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 14:47:31 -07:00
Maria Bermudez af5f2fcc38 Merge branch 'master' of github.com:docker/docs-private into test-branch-2 2018-08-29 14:31:51 -07:00
Maria Bermudez 338b690d26 Adding period to confirmation message 2018-08-29 14:28:33 -07:00
Anne Henmi 8091cc1bcc
Merge pull request #7280 from gtardif/release_notes_18.06.1-ce-win73 
Release notes for 18.06.1-ce-win73 (Stable) cc @gbarr01
 2018-08-29 11:35:12 -06:00
Anne Henmi b2b18f5e6b
Update release-notes.md 
Fixed typo
 2018-08-29 11:22:00 -06:00
Anne Henmi 8031133450
Merge pull request #7279 from gtardif/release_notes_18.06.1-ce-mac73 
Release notes for 18.06.1-ce-mac73 (Stable) cc @gbarr01
 2018-08-29 11:20:42 -06:00
Anne Henmi d83eb2bc25
Merge pull request #7278 from gtardif/release_notes_18.06.1-ce-win74 
Release notes for 18.06.1-ce-win74 (Edge) cc @gbarr01
 2018-08-29 11:19:28 -06:00
Anne Henmi b3eb78f52a
Update edge-release-notes.md 
Fixed typo
 2018-08-29 11:08:20 -06:00
Anne Henmi 88d0380b8b
Merge pull request #7277 from gtardif/release_notes_18.06.1-ce-mac74 
Release notes for 18.06.1-ce-mac74 (Edge) cc @gbarr01
 2018-08-29 11:06:24 -06:00
Maria Bermudez af336c1ae3 Merge remote-tracking branch 'docs-public/master' 2018-08-29 09:52:48 -07:00
Maria Bermudez 495f118bd6
Merge pull request #688 from docker/revert-644-saas_phase1 
Revert "(Phase 1) Hub/Store/Cloud SaaS consolidation"
 2018-08-29 09:28:24 -07:00
Peter McKee 94f5ab69ae Revert "[WIP] Hub/Store/Cloud SaaS consolidation (#644)" 
This reverts commit 07306b639d.
 2018-08-29 11:13:17 -05:00
Jenkins-pr-release-docs 5cef30147f Docker for win stable relnotes 18.06.1-ce-win73 
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
 2018-08-29 08:17:28 +00:00
Jenkins-pr-release-docs 793ac64980 Docker for mac stable relnotes 18.06.1-ce-mac73 
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
 2018-08-29 08:16:06 +00:00
Jenkins-pr-release-docs 5ad3338e2f Docker for win edge relnotes 18.06.1-ce-win74 
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
 2018-08-29 08:12:55 +00:00
Jenkins-pr-release-docs ed036fdc5a Docker for mac edge relnotes 18.06.1-ce-mac74 
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
 2018-08-29 08:11:35 +00:00
Anne Henmi 38305a68c7
Merge pull request #7271 from docker/bermudezmt-patch-1 
Grammar fixes
 2018-08-28 14:23:07 -06:00
Maria Bermudez ab5ad46fc2
Change "re-create" to recreate 2018-08-27 16:27:22 -07:00
Maria Bermudez fa09742e7e
Grammar fixes 2018-08-27 16:21:57 -07:00
Anne Henmi 0fabbd8456
Merge pull request #7266 from ahh-docker/branch-ahh 
Punctuation fix
 2018-08-27 11:37:01 -06:00
Anne Henmi 59a9c5a8da
Update ee-linux-install-reuse.md 2018-08-27 11:35:58 -06:00
Anne Henmi 52febf8430 Punctuation fix 2018-08-27 10:02:52 -06:00
Tammy Fox 06bb961ae2
Merge pull request #7247 from omegamormegil/patch-7 
Fix UCP upgrade only upgrades one node
 2018-08-24 17:04:46 -04:00
Tammy Fox 572e5f9a76
Merge pull request #6962 from trapier/dtr-rethinkcli-noninteractive 
introduce rethinkcli non-interactive mode for DTR 2.2-2.5
 2018-08-24 17:00:18 -04:00
Tammy Fox 33ef8ed45b
Merge pull request #7135 from ollypom/updateeeversions 
Update Variables to UCP 3.0.3
 2018-08-24 16:58:43 -04:00
Tammy Fox a7d8859020
Merge pull request #7205 from ollypom/offlinebundless 
Updated UCP 3.0.4 offline bundles
 2018-08-24 16:44:03 -04:00
Tammy Fox c2e0da725b
Merge pull request #7176 from carlfischer1/patch-6 
extend description of Windows Server 1709 and 1803
 2018-08-24 16:19:19 -04:00
Tammy Fox a7cf91064f
Merge branch 'master' into patch-6 2018-08-24 16:19:12 -04:00
Tammy Fox 0ab7b3d96f
Merge pull request #7251 from bitmonk/patch-1 
Remove out-of-date note about Kubernetes
 2018-08-24 16:18:08 -04:00
Tammy Fox d1c0f96fb2
Merge pull request #7261 from docker/bermudezmt-patch-3 
Formatting and grammar updates
 2018-08-24 16:17:16 -04:00
Tammy Fox beb7383d74
fix liquid tag 2018-08-24 16:16:43 -04:00
Tammy Fox bf14bccb6f
put warning example in code block 2018-08-24 16:15:04 -04:00
Tammy Fox e4afd61727
Merge pull request #6972 from carlfischer1/patch-4 
Update Windows install instructions to support multiple channels
 2018-08-24 16:11:37 -04:00
Tammy Fox 6cafc370d6
don't link to "here" 2018-08-24 16:11:15 -04:00
Tammy Fox c186d7aa6c
Merge pull request #7234 from docker/bermudezmt-patch-1 
Reflect name change from IBM z Systems to IBM Z
 2018-08-24 12:53:37 -04:00
Tammy Fox c5712d0545
Merge pull request #7260 from docker/bermudezmt-patch-2 
Remove DockerCon '18 SF advert from site
 2018-08-24 12:52:29 -04:00
Maria Bermudez 55d6ea8cbf
Formatting and grammar updates 
- Update phrasing on "Manage Docker as a non-root user"
- Make "Docker daemon" usage consistent
- Update systemd vs daemon.json formatting
 2018-08-23 16:35:55 -07:00
Maria Bermudez 05886b2dde
Remove DockerCon '18 SF advert from site 2018-08-23 12:32:36 -07:00
Tammy Fox 51cb6c2de1
Merge pull request #6950 from bjsun/patch-2 
fix: configuration reference link
 2018-08-22 14:29:14 -04:00
Maria Bermudez 7b5e8b7aff
Revert absolute path change 
Existing link works on docs.docker.com
 2018-08-21 15:50:35 -07:00
Justin Alan Ryan e1dcb93035
Remove out-of-date note about Kubernetes 
The documentation for the current stable release insists that Kubernetes is only available in Edge, which is confusing as the current stable release is an entire major version newer than the Edge version in which Kubernetes was introduced.

This blurb is easily enough removed. :)
 2018-08-21 13:49:23 -07:00
Nathan Jones e7509a4893
Fix UCP upgrade only upgrades one node 
Running the UCP upgrade upgrades all managers and workers to the new version, contrary to what is described here. Here is sample output from running this command:

$ docker container run --rm -it   --name ucp   -v /var/run/docker.sock:/var/run/docker.sock   docker/ucp:2.2.12   upgrade --interactive
Unable to find image 'docker/ucp:2.2.12' locally
2.2.12: Pulling from docker/ucp
a073c86ecf9e: Already exists 
fae35fe3a426: Pull complete 
f13c1be613a6: Pull complete 
Digest: sha256:61d4a2e8969a0139187ecf13af8c0020bb7bb5ff5efa2b06e331394a67bd4b68
Status: Downloaded newer image for docker/ucp:2.2.12
INFO[0000] Your engine version 17.06.2-ee-16, build 9ef4f0a (4.4.0-133-generic) is compatible 
INFO[0000] Upgrade the UCP 2.2.5 installation on this cluster to 2.2.12 for UCP ID: sc3nkn5p6rnc33o1e33mnqa1r 
INFO[0000] Once this operation completes, all nodes in this cluster will be upgraded. 
Do you want proceed with the upgrade? (y/n): y
 2018-08-21 14:29:48 -04:00