Commit Graph

188 Commits

Author SHA1 Message Date
Anne Henmi b272669931
Merge branch 'master' into patch-1 2019-01-23 12:17:03 -07:00
Anne Henmi faefb9849d
Merge branch 'master' into patch-3 2019-01-23 08:57:00 -07:00
L-Hudson 178b6ceb10
Merge pull request #8009 from seemethere/fix_ubuntu
TAR-301 Fix ubuntu installation instructions for EE
2019-01-18 13:17:56 -05: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
Maria Bermudez ceaf911720
Merge pull request #7975 from Drugoy/patch-1
Remove bad, breaky advice
2019-01-15 15:04:45 -08: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
Sebastiaan van Stijn a68622b754
Remove installation instructions for hypriot compose
This page is meant to install the Docker Engine, not compose,
and we should not direct users to non-official (and possibly
outdated) versions of Docker Compose.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:15:51 +01:00
Sebastiaan van Stijn 2e78ea3650
Remove note about daemon starting automatically
The next step already verifies that it's working, so
this line is redundant.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:04:06 +01:00
Sebastiaan van Stijn ffab795627
Remove armhf/hello-world, because hello-world is multi-arch now
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:04:01 +01:00
Sebastiaan van Stijn d75ee56ee7
Simplify instructions to install a specific version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:56 +01:00
Sebastiaan van Stijn 63e54ff85d
Fix instructions for arm64 being listed twice
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:50 +01:00
Sebastiaan van Stijn 79857767c1
Use consistent wording for s390x and power
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:46 +01:00
Sebastiaan van Stijn 6c77747b8e
Align instructions and wording between Ubuntu and Debian
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:41 +01:00
Sebastiaan van Stijn 1f6e2aec0d
Mention docker.io package as old name
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:37 +01:00
Sebastiaan van Stijn 3f370fb512
Remove Fedora 26, 27, and add Fedora 28
Fedora 26 and 27 are no longer supported, and no new packages
are published for them.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:33 +01:00
Sebastiaan van Stijn 5047fdee86
Remove trusty 14.04, add cosmic 18.10
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:28 +01:00
Sebastiaan van Stijn c73473e9b3
Remove jessie and wheezy from installation docs
These are no longer supported by the current version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-12 03:03:20 +01:00
Eli Uriegas 594f9e1b1a Fix ubuntu installation instructions for EE
Was point to a non-existent $DOCKER_EE_VERSION repository, and still had
installation instructions for s390x and ppc64el which we do not support
with the latest EE release.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-01-11 23:18:39 +00:00
Maria Bermudez 40714e8717
Merge pull request #7352 from zlim/patch-1
Update ubuntu.md
2019-01-08 07:29:25 -08:00
David Birks 8750f1e195
Fix add-apt-repository command
Adds the word `stable` to the `add-apt-repository` command to fix the `Malformed entry` error.
2019-01-07 11:03:15 -05: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
Anne Henmi c64de0db8c
Update ubuntu.md
Fixed package name.
2019-01-02 08:53:08 -07: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
Anne Henmi 18c8aa001a
Update ubuntu.md 2018-12-28 08:41:11 -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
Nikita Shpilevoy 2691045247
Added gpg-agent dependency
gpg-agent isn't installed by default in Ubuntu on some hostings. This leads to error:
gpg: failed to start agent '/usr/bin/gpg-agent': No such file or directory
gpg: can't connect to the agent: No such file or directory
2018-12-17 13:19:33 +03: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
Anne Henmi 34cf238c76
Merge pull request #7300 from andrewhsu/rma
Remove Ubuntu Artful because EOL
2018-09-26 08:20:56 -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
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02: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
zlim f5dfce07dc
Update ubuntu.md
Add reference to arm64
2018-09-11 12:16:32 -07: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
Vadim-Zenin 294974fad2
linux-postinstall.md updated
$HOME variable will exclude mistake for users with custom home folder location.
2018-09-07 23:04:22 +01:00
Andrew Hsu 7fd79d10ad Remove Ubuntu Artful because EOL
The Artful release of Ubuntu EOL on 2018-07-19.
https://wiki.ubuntu.com/Releases

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-08-31 00:59:56 +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
Tammy Fox beb7383d74
fix liquid tag 2018-08-24 16:16:43 -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
David Yu 0047eb5a88
Update rhel.md 2018-08-09 16:26:13 -07:00