centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 23:08:49 +07:00
Code Issues Packages Projects Releases Wiki Activity
53,417 Commits 54 Branches 28 Tags
88afa609131fc02f052d55addb76becc601ed977
Commit Graph

88 Commits

Author SHA1 Message Date
Adrian Plata
f56653138a Clarify FIPS instructions 
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
 2019-09-30 16:43:43 -07:00
Nathan Jones
4fa527705e Updated for EE 3.0 (#9481) 
* Updated for EE 3.0

Instructions hadn't been updated for EE 3.0

* Switched the Engine Version to use Site Variable
 2019-09-19 20:00:46 +01:00
Kirill Kolyshkin
0fd8f933fa suse.md: info about sles and docker-ee versions (#9192) 
1. `12.3` is not the only SLES version supported.

2. Latest Docker EE version is 19.03

3. Provide a complete example.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2019-08-05 11:10:32 -07:00
ollypom
9bafc04bcc Fixed Conflict 2019-07-08 17:00:49 +00:00
Olly Pomeroy
b5659dd1de Added additional SUSE redirect 
Signed-off-by: Olly Pomeroy <olly@docker.com>
 2019-06-24 21:11:17 +01:00
Dawn W Docker
f4dde18e07 branding changes 
Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
 2019-06-11 14:37:45 -07:00
Kirill Kolyshkin
02b8e67e54 ubuntu.md: remove old docker-ce-cli (#8665) 
I hit the following error when "upgrading" docker-ce 18.09 to docker-ee 17.06:

> dpkg: error processing archive /var/cache/apt/archives/docker-ee_3%3a17.06.2~ee~19~3-0~ubuntu_amd64.deb (--unpack):
 trying to overwrite '/usr/share/fish/vendor_completions.d/docker.fish', which is also in package docker-ce-cli 5:18.09.4~2.1.rc1-0~ubuntu-xenial

This commit adds `docker-ce-cli` to the list in "uninstall old packages" to fix this.
 2019-05-16 18:42:10 -07:00
Sebastiaan van Stijn
03d5b3396d Use consistent formatting for notes 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-09 00:49:57 +01:00
Andrew Hsu
128b54cef8 also add docker-ee-cli to docker-ee install instructions 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-01-30 01:53:01 +00:00
Andrew Hsu
95c850fcb1 update install instructions of latest docker-ee to include containerd 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-01-30 01:29:17 +00:00
L-Hudson
1d9acb814e Merge pull request #6916 from hannah-docker/patch-2 
Update centos.md indicating that we only support the latest CentOS
 2019-01-25 09:38:27 -05:00
Anne Henmi
faefb9849d Merge branch 'master' into patch-3 2019-01-23 08:57:00 -07: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
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
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
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
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
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