1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Victoria Bialas
4038b1ae6c added beta 36 relnotes, and minor wording updates to Docker.qcow2 question in Mac FAQs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 19:18:10 -08:00
lj8930
3dbad619ff Update get-started-macvlan.md
fix typo
2017-01-13 11:16:40 +08:00
snesneros
581de75caa Update step_six.md (#1105) 2017-01-12 19:13:36 -08:00
Kun Ren
9afc52cfda Add alternative keyservers due to #13555 (#1048) 2017-01-12 18:57:47 -08:00
snesneros
4e007daa92 Update PULL_REQUEST_TEMPLATE.md (#1106)
Change 'left' to 'right' (because that's where the referenced information is located.
2017-01-12 18:56:55 -08:00
Victoria Bialas
54055dbf48 Merge pull request #1100 from djs55/docker-for-mac-trim
docker-for-mac: add a FAQ about reducing the qcow2 size
2017-01-12 18:51:19 -08:00
Joao Fernandes
979fcb5828 Merge pull request #1117 from joaofnfernandes/canonical-urls
Removes duplicate canonical urls
2017-01-12 18:43:48 -08:00
Joao Fernandes
6f512f62ac Merge pull request #1112 from aduermael/jenkins-cleanup
Jenkinsfile: avoid container collisions (unique tags)
2017-01-12 18:33:17 -08:00
Victoria Bialas
486278c4e8 linked to related GitHub issue, slight re-ordering of topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 18:33:14 -08:00
Clorr
155fcee432 Correction of the Install-Module command (#1102)
The command line was Import-Module which seems to be wrong. It seemed to work for me with Install-Module. So I make the correction. Please note, I'm only a newbie, so check this twice please ;-)
2017-01-12 18:20:58 -08:00
Riyaz Faizullabhoy
bbd5c2723b Fix root_ca, json structure (#1079)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-12 18:11:48 -08:00
Joao Fernandes
a6476905b7 Removes duplicate canonical urls 2017-01-12 18:11:24 -08:00
Josue Zarzosa
a577949194 Remove reference to legacy container links (#1057) 2017-01-12 18:11:04 -08:00
Victoria Bialas
d9d150fb16 Merge pull request #1115 from londoncalling/toolbox-install-direct-links
added direct installer links, re-worked Toolbox intro pages
2017-01-12 18:01:27 -08:00
Victoria Bialas
69a9da9be4 added direct installer links, re-worked Toolbox intro pages
updated Toolbox install intros

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 17:51:02 -08:00
Joao Fernandes
1b213f5ab5 Merge pull request #1114 from cpuguy83/1.10.3-cs4
Add release notes for 1.10.3-cs4
2017-01-12 17:08:19 -08:00
Brian Goff
0c474add6e Add release notes for 1.10.3-cs4
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 19:17:29 -05:00
Adrien Duermael
01562d5dc7 tag images and containers with JOB_BASE_NAME + BUILD_NUMBER
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-12 16:13:51 -08:00
Joao Fernandes
4dc2cd7a2f Merge pull request #1113 from joaofnfernandes/broken-links
Update links to DTR
2017-01-12 16:01:58 -08:00
Joao Fernandes
5008e56c7d Update links to DTR 2017-01-12 15:37:07 -08:00
Victoria Bialas
4afdfa1a93 Merge pull request #1096 from londoncalling/toolbox-install-links-web-launch
added links to Toolbox installer downloads via Releases page
2017-01-12 13:50:54 -08:00
Joao Fernandes
33ec8e404d Merge pull request #1108 from joaofnfernandes/redirect-dtr-install
Add new redirect for DTR install
2017-01-12 12:10:49 -08:00
Joao Fernandes
a0d625b417 Merge pull request #1109 from cpuguy83/1.11.2-cs6
Add 1.11.2-cs6 release notes
2017-01-12 12:10:11 -08:00
Joao Fernandes
9c87f82b0f Merge pull request #1110 from joaofnfernandes/broken-links
Updates broken links for #1068
2017-01-12 12:08:27 -08:00
Victoria Bialas
6dfd8e9d2e added links to Toolbox installer downloads via Releases page
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 12:04:43 -08:00
Joao Fernandes
f7a33dc833 Updates broken links for #1068 2017-01-12 11:54:21 -08:00
Brian Goff
144abc4204 Add 1.11.2-cs6 release notes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 14:48:56 -05:00
Joao Fernandes
c3ac3b3247 Add new redirect for DTR install 2017-01-12 11:43:14 -08:00
Joao Fernandes
3bcfe97272 Merge pull request #1080 from cpuguy83/1.12.6-cs
Add cs-engine 1.12.6-cs6 release notes
2017-01-12 10:25:31 -08:00
Brian Goff
1648228182 Add cs-engine 1.12.6-cs6 release notes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 10:11:53 -08:00
LRubin
8a8bcde834 Merge pull request #1095 from sanscontext/fix-note
Some format fixing and light rewording on note
2017-01-12 09:26:06 -08:00
Sebastiaan van Stijn
fdef92c118 Update instructions for systemd drop-ins
When creating a `/etc/systemd/system/docker.service`
unit file, that file _replaces_ the default
(`/lib/systemd/system/docker.service`) unit file.

While this may be intended by some, this section
describes how to use "partial" unit files ("drop-ins")
to override only certain properties of the default
unit file.

This patch removes the mention of
`/etc/systemd/system/docker.service` to prevent
users from inadvertently replacing the default
unit file.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 14:24:10 +01:00
David Scott
b9df8fd204 docker-for-mac: add a FAQ about reducing the qcow2 size
In Docker for Mac 1.12 the only way to free space on the host is to
delete the qcow2 which means all containers and images have to be
rebuilt.

In Docker for Mac 1.13 there is preliminary support for shrinking the
qcow2 file non-destructively using "TRIM" (as also used on SSDs).
Unfortunately this isn't (yet) fully automatic -- it runs in the
background and requires the app to be occasionally restarted.

Related to [docker/for-mac#371]

Signed-off-by: David Scott <dave.scott@docker.com>
2017-01-12 10:21:20 +00:00
Mathieu Parent
3b50331c97 Always use sudo on Debian installation 2017-01-12 09:45:01 +01:00
LRubin
64559ac1dc format fix and light rewording
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 16:58:06 -08:00
LRubin
9157ec86aa Merge pull request #1094 from sanscontext/issue-1013
Cloud: docker is no longer optional in this 2nd tutorial
2017-01-11 16:42:23 -08:00
LRubin
d5a6d2993c Merge pull request #1000 from kizbitz/patch-1
Update deploy-to-cloud-btn.md
2017-01-11 16:36:08 -08:00
LRubin
e223f8117e docker is no longer optional in this tutorial
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 16:21:36 -08:00
LRubin
32f0406945 Merge pull request #1092 from sanscontext/fix-cloud-links
more link fixes
2017-01-11 15:13:44 -08:00
LRubin
78ddec623b Merge pull request #1093 from aduermael/exclude-cloud-api-source
exclude /apidocs/cloud-api-source when building
2017-01-11 15:03:18 -08:00
LRubin
a3a53fc3ff more more link link fixes fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
Adrien Duermael
1ef7132a6f exclude /apidocs/cloud-api-source when building
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 14:46:06 -08:00
LRubin
fde978afc5 more link fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 14:43:52 -08:00
John Mulhausen
6f19cd1e0e Fixes #1086 2017-01-11 13:47:22 -08:00
LRubin
ae80059160 Merge pull request #1088 from sanscontext/fix-cloud-links
url fixes for #1068
2017-01-11 13:39:57 -08:00
LRubin
e059b654e0 url fixes for #1068
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 13:26:50 -08:00
LRubin
613d448b1c Merge pull request #1087 from aduermael/absolute-urls-in-includes
fixed links in /apidocs/docker-cloud/includes
2017-01-11 12:17:34 -08:00
Adrien Duermael
b193b00826 cf6fc379 fix had to be made in /apidocs/cloud-api-source
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 12:06:08 -08:00
Adrien Duermael
cf6fc37931 fixed links in /apidocs/docker-cloud/includes
urls in html files that are included must be absolute, otherwise it only works when the files are included in some specific location.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 11:04:11 -08:00
Andy Yu
333fe83af9 urls (#1074)
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-01-10 14:56:22 -08:00