Commit Graph

14 Commits

Author SHA1 Message Date
paigehargrave c85c65eaec
Merge branch 'master' into 404-fix 2019-01-30 20:09:30 -05:00
paigehargrave d74425ef51
Fix user guide link 2019-01-29 21:56:09 -05:00
Andrew Hsu 96c56dabca also add docker-ce-cli to docker-ce install instructions
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-01-30 01:29:17 +00:00
Andrew Hsu 49b80a76cc update install instructions of latest docker-ce to include containerd
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-01-30 01:19:02 +00:00
Sebastiaan van Stijn 7002b9c5c2
Merge pull request #8006 from thaJeztah/remove_edge_reference_docs
Remove edge documentation
2019-01-18 19:13:58 +01:00
Sebastiaan van Stijn 9b18fa836e
Remove edge from installation instructions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-14 22:45:08 +01:00
Sebastiaan van Stijn aae9bfc276
Rename / remove edge-related variables
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-14 22:44:58 +01:00
Drugoy bd77b434fe
Remove bad, breaky advice
`yum remove docker-selinux` and `yum remove docker-engine-selinux` result into a prompt to remove `container-selinux` package, which, in turn, is a dependency for `docker-ce`, which results into a prompt to remove it as well.
2019-01-06 00:04:03 +03:00
imba-tjd 7ca7892177 Fix anchor 2018-09-18 19:13:23 +08:00
Joao Fernandes 3cd6cdc53b Refactor CE vs EE 2018-05-02 13:56:17 -07:00
Gwendolynne Barr 3a08079a03
Remove references to production; Clean text phase 1 (#6374) 2018-04-04 16:37:46 -07:00
ksabhnan eec7887351 Update centos.md (#6300)
* Update centos.md

Text doesnt match version from command output

* Update centos.md
2018-04-02 09:55:31 -07:00
Sebastiaan van Stijn fee069375e Add more packages to uninstall before installation (#6092)
The CentOS, Red Hat, and Fedora package-repositories contain
several versions of the docker package. Some of those were
missing from the list of packages to uninstall, and could
conflict with the docker-ce/docker-ee package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-28 10:15:18 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -08:00