Commit Graph

110 Commits

Author SHA1 Message Date
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
AndersFluur fb64be7b87
Adding arm64 (aarch64 architecture) 2019-01-02 14:35:27 +01:00
Anne Henmi d235ceeb49
Merge pull request #7717 from sudo-bmitch/pr-uninst-old
Adding containerd and runc to cleanup on old Debian/Ubuntu installs
2018-12-28 10:05:04 -07:00
Anne Henmi 26eb27d3b0
Merge pull request #7161 from amaddio/patch-2
Update ubuntu.md
2018-12-28 09:54:08 -07:00
Anne Henmi a343a3d2e8
Merge pull request #7160 from amaddio/patch-1
Update ubuntu.md
2018-12-28 09:51:43 -07:00
Maria Bermudez dffeb3432e
Standardize terms and update formatting on note 2018-12-27 12:24:23 -08:00
Maria Bermudez 82abbc68df
Rearrange link to avoid using parentheses 2018-12-27 12:18:53 -08:00
David Yu 5e21a8633d
Update rhel.md
Updating RHEL docs based on compat matrix for Latest Enterprise 2.1 release: https://success.docker.com/article/compatibility-matrix
2018-12-27 12:10:00 -08:00
Maria Bermudez 24296c20e5
Merge pull request #7530 from andrewhsu/c
remove docker-ce as thing to remove
2018-12-27 10:04:52 -08:00
Maria Bermudez edc4e92fa7
Merge branch 'master' into v 2018-12-27 10:03:44 -08:00
Anne Henmi 7e692cdb9f
Merge branch 'master' into patch-5 2018-12-26 10:37:12 -07:00
Luiz Mandico dc76c5e9a5
Update linux-postinstall.md
Fix line 482. In 'steps 3 and 4', for 'steps 2 and 3'.
2018-12-21 08:15:09 -02:00
Jeffrey Morgan 893c82a11f Merge branch 'upstream-master' 2018-11-25 12:31:28 -05:00
Maria Bermudez 50069891c0
Merge pull request #5982 from gidder/patch-1
add info about arm64 repo
2018-11-20 11:56:33 -08:00
Jeffrey Morgan dacad06fbd Merge branch 'master' into consolidation-changes 2018-11-19 15:41:14 -05:00
Brandon Mitchell 3124583254 Adding containerd and runc to cleanup on old Debian/Ubuntu installs
Signed-off-by: Brandon Mitchell <git@bmitch.net>
2018-11-17 09:49:20 -05:00
Darwin Traver 78fae138d7
Fix FIPS /proc path typo 2018-11-15 18:07:49 -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
Anne Henmi 632a8b9c82
Update ubuntu.md 2018-11-12 13:59:48 -08:00
Anne Henmi a6c4367af9
Update suse.md 2018-11-12 13:58:06 -08:00
Anne Henmi c853b0a54b
Update ubuntu.md
Fixed wording and added links to the note.
2018-11-12 08:55:17 -07:00
Anne Henmi 32243eeb55
Update suse.md
Fixed wording in the note, as well as put in links for the previous version installation guides.
2018-11-12 07:52:40 -08:00
Anne Henmi d151677f80
Update ubuntu.md 2018-11-09 10:46:01 -08:00
Anne Henmi a8626b7d88
Update suse.md 2018-11-09 10:45:18 -08:00
Anne Henmi d9e24d6de4
Update ubuntu.md 2018-11-09 10:40:46 -08:00
Anne Henmi 70a7d5ef0f
Update suse.md 2018-11-09 10:39:56 -08:00
Anne Henmi 37913d2188 Updated version to 18.09 and moved a note for 18.03 engine only and 17.06 as previous versions.. 2018-11-09 10:09:47 -08:00
Maria Bermudez d81915b04a Update Go template formatting 2018-11-07 12:19:19 -08:00
Anne Henmi e644d054bc
Update rhel.md 2018-11-07 11:26:33 -08:00
Anne Henmi 53d1e49fe6
Update rhel.md 2018-11-07 11:25:39 -08:00
Anne Henmi 56ff2f335b Escaped {{ }} in command output. 2018-11-07 11:23:09 -08: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
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
Andrew Hsu 29cc1ca549 use DOCKER_EE_VERSION in ubuntu install instructions
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-10-17 21:25:53 +00:00
Andrew Hsu 7868940f77 remove docker-ce as thing to remove
The docker-ee packages will take care of removing docker-ce.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-10-17 21:19:58 +00:00
Anne Henmi 1e91176d27
Update rhel.md
Incorporated @andrewhsu's feedback.
2018-10-15 15:09:11 -06:00
Anne Henmi b2e60b1f60
Update rhel.md
Added beta tag.
2018-10-10 10:49:22 -06:00
Anne Henmi 7c6f4efc90
Update rhel.md
Fixed @justincormack's wording.
2018-10-05 10:46:36 -06:00
Anne Henmi 36d6a8e85f
Update rhel.md
incorporated @davidwilliamson's feedback.
2018-10-04 19:24:56 -06:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Maria Bermudez eb608ee28d
Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Anne Henmi 7d80bd0202 Included updates from https://github.com/docker/docker-core-backlog/issues/375. 2018-10-03 14:03:10 -06:00
Anne Henmi 306fe4c56e Merge branch 'fips-engine-config-672' of github.com:docker/docs-private into fips-engine-config-672 2018-10-02 09:52:42 -06:00
Anne Henmi 6411c478b7 Fixed docker info command output. 2018-10-02 09:42:45 -06:00
Cameron Gagnon b74257439b
Grammatical change of 'you' to 'your' 2018-10-01 13:47:06 -07:00
Anne Henmi 07722100d4
Merge pull request #7340 from Vadim-Zenin/patch-1
linux-postinstall.md updated
2018-09-26 10:32:31 -06:00
Anne Henmi 9fa66965f2
Merge pull request #7342 from andrewhsu/o
add ol7_addons repo enable steps for oraclelinux
2018-09-26 09:57:48 -06:00
Anne Henmi 42e0574396
Merge pull request #7382 from imba-tjd/master
Fix anchor
2018-09-26 08:31:45 -06:00