Commit Graph

62 Commits

Author SHA1 Message Date
Jeffrey Morgan
dacad06fbd Merge branch 'master' into consolidation-changes 2018-11-19 15:41:14 -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
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
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
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
Anne Henmi
ee892c2a37 Merge pull request #7292 from darwin-traver/patch-7
RHEL 7.5 addition
2018-09-26 08:18:52 -06:00
Anne Henmi
4c259f1f3b Update rhel.md
fixed hyperlink
2018-09-25 17:53:23 -06:00
Anne Henmi
c20652b1c9 Update rhel.md 2018-09-25 17:52:02 -06:00
Anne Henmi
fa8353cd31 Update rhel.md 2018-09-25 17:51:00 -06:00
Anne Henmi
4111b2e5f7 Update rhel.md 2018-09-25 13:09:46 -06:00
Anne Henmi
b12fb02578 Added Windows information and docker info output to both RHEL and Windows. 2018-09-25 12:46:10 -06:00
Anne Henmi
7b76b1eaa9 Fixed wording. 2018-09-24 08:05:20 -06:00
Anne Henmi
346d5b01c0 Fixed typo 2018-09-24 08:03:49 -06:00
Anne Henmi
b61e11f41d Created instructions for adding or removing FIPS support in RHEL. 2018-09-24 08:01:59 -06:00
Anne Henmi
a83dc18d93 initial FIPS edits. 2018-09-21 15:40:39 -06:00
imba-tjd
7ca7892177 Fix anchor 2018-09-18 19:13:23 +08:00
Andrew Hsu
8bbeeb8101 remove oraclelinux warning about unable to install with selinux
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-09-09 01:27:55 +00:00
Andrew Hsu
7b0dabc226 fix channel for docker-ee install on ubuntu
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-08-30 23:56:55 +00:00
Darwin Traver
359eb0de74 RHEL 7.5 addition 2018-08-30 17:38:33 -04: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
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
Alex Seymour
b3ea302bb2 Fix SLES gpg url
The gpg key is in the top level directory for each distribution, using "${DOCKER_EE_URL}/sles/gpg" will attempt to load the gpg key from within the 12.3/<architecture>/<version>/ subdirectory, because of how DOCKER_EE_URL is set before.
2018-07-27 09:59:25 +02:00
Joao Fernandes
77e3aebdb2 Update install instructions for SLES 2018-06-27 20:10:15 -07:00