Commit Graph

42248 Commits

Author SHA1 Message Date
Sebastiaan van Stijn c6ba6498b3
Restore missing "format" example
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit edbb8fb86d7d0b715adc15415f0cb187433092a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:29 +02:00
Yong Tang af46f0242e
Fix a couple of issues in Get Started docs
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.

2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cd06fdd1ac5ce1f91291330d9f89679468ce393)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:22 +02:00
Sebastiaan van Stijn c9ce561ac0
Add direct link to event chart image
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 86de72fef244b3fe209e5793deb40fb26f5b318e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:14 +02:00
Sebastiaan van Stijn 792c545f52
Remove Frugalware installation docs
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:06 +02:00
Victor Vieux cd589e16c8
add some plugin manifest reference doc
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 44a16acff15b5da3103fd002ad5064cb7b375106)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:16:57 +02:00
lixiaobing10051267 bc97dc1e50
remove some incorrect bash symbols
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 2d1d4684f0fc752aae7e41af03a0f1589f11ee00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:16:46 +02:00
Misty Stanley-Jones 17f54b8475 Move machine docs to machine subdirectory 2016-09-28 20:45:49 -07:00
Misty Stanley-Jones 29f7d3396b Initial import of https://github.com/docker/machine 2016-09-28 20:44:12 -07:00
Misty Stanley-Jones 52a1ad7609 Initial import of https://github.com/docker/pinata 2016-09-28 20:40:01 -07:00
Misty Stanley-Jones 5425536e14 Initial import of https://github.com/docker/pinata 2016-09-28 20:36:30 -07:00
Misty Stanley-Jones 0b95b86011 Move kitematic docs to kitematic subdirectory 2016-09-28 16:46:17 -07:00
Misty Stanley-Jones eaf7fc7244 Initial import of https://github.com/docker/kitematic 2016-09-28 16:43:46 -07:00
Misty Stanley-Jones 4dd28a91ef Move opensource docs to opensource subdirectory 2016-09-28 16:42:34 -07:00
Misty Stanley-Jones a772b5304a Initial import of https://github.com/docker/opensource 2016-09-28 16:41:17 -07:00
Misty Stanley-Jones b01677e524 Move toolbox docs to toolbox subdirectory 2016-09-28 16:39:30 -07:00
Misty Stanley-Jones 723b8e81fc Initial import of https://github.com/docker/toolbox 2016-09-28 16:36:10 -07:00
Misty Stanley-Jones 9c69f388c5 Move notary docs to notary subdirectory 2016-09-28 16:35:14 -07:00
Misty Stanley-Jones d522d7c6b3 Initial import of https://github.com/docker/notary 2016-09-28 16:29:48 -07:00
Misty Stanley-Jones ad063c8987 Move swarm docs to swarm subdirectory 2016-09-28 14:54:30 -07:00
Misty Stanley-Jones a78f6e80ac Initial import of https://github.com/docker/swarm 2016-09-28 14:53:14 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00
Misty Stanley-Jones 89f6699de8 Initial import of https://github.com/docker/compose 2016-09-28 14:48:48 -07:00
Misty Stanley-Jones df52708a85 Moved registry docs to registry subdirectory 2016-09-28 14:46:28 -07:00
Misty Stanley-Jones 95951fc984 Initial import of https://github.com/docker/distribution 2016-09-28 14:45:00 -07:00
Misty Stanley-Jones c493719f19 Move docker-store docs to docker-store subdirectory 2016-09-28 14:40:26 -07:00
Misty Stanley-Jones 9b50ee3943 Initial commit -f https://github.com/docker/mercury-ui 2016-09-28 14:39:20 -07:00
Misty Stanley-Jones af078a5cb6 Move docker-hub docs to docker-hub subdirectory 2016-09-28 14:37:27 -07:00
Misty Stanley-Jones cdc8eba140 Imitial import of https://github.com/docker/hub2-demo 2016-09-28 14:36:23 -07:00
Misty Stanley-Jones 9224c67d2e Moved imported orca docs into ucp directory 2016-09-28 14:35:02 -07:00
Misty Stanley-Jones 060a96b814 Initial commit -f https://github.com/docker/orca 2016-09-28 14:33:25 -07:00
Misty Stanley-Jones e6b2531858 Moved docker-trusted-registry imported docs to apidocs and docker-trusted-registry subdirectories 2016-09-28 14:29:59 -07:00
Misty Stanley-Jones 8c1f94a903 Initial import of https://github.com/docker/dhe-engine 2016-09-28 14:25:04 -07:00
Misty Stanley-Jones a4ae8a109c Moved cs-engine docs to the cs-engine subdirectory 2016-09-28 14:19:05 -07:00
Misty Stanley-Jones 307ab54a22 Initial import of https://github.com/docker/cs-docker 2016-09-28 14:17:14 -07:00
Misty Stanley-Jones f0a62ccf9b Initial repo commit 2016-09-28 14:14:26 -07:00
Victoria Bialas 95041b4cfe WIP: docs update for d4mac, d4win, Hyper-V driver and other virtualization factors, swarm mode
more updates to Machine docs for creating local VMsM

added details and example on using hyper-v driver, formatted headings for other driver docs

copyedits

incorporated Nathan's copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-09-28 13:12:53 -07:00
Victor Vieux 45bed2cc80 Bump VERSION to v1.12.2-rc1
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-27 20:37:47 +00:00
Victor Vieux 1ec9ca1ca6 Merge pull request #26866 from docker/cherry-picks-1.12.2
Cherry picks 1.12.2
2016-09-27 13:33:29 -07:00
Brian Goff 707163c38c Merge pull request #26949 from thaJeztah/revert-docker-create-rm
1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-doc…
2016-09-27 16:20:32 -04:00
Sebastiaan van Stijn 8f598d9027 Merge pull request #26956 from vieux/changelog-1.12.2
Update CHANGELOG for 1.12.2
2016-09-27 21:00:48 +02:00
Victor Vieux 3d8e9bfcda Merge pull request #26953 from mavenugo/gossip_retry
Vendor libnetwork#1473
2016-09-27 11:37:29 -07:00
Madhu Venugopal 2d183336ec Vendor libnetwork#1473
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-09-27 09:23:59 -07:00
Sebastiaan van Stijn e9c655442a
1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm"
This reverts commit 44180a48e9,
as `docker create --rm` is part of docker 1.13, so should
not be in the 1.12 branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-27 16:33:53 +02:00
Victor Vieux f25dffe56a Update CHANGELOG for 1.12.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 23:56:07 -07:00
Aaron Lehmann b6943c50f1 cluster: Do not autodetect advertise address on join
On join, remote addresses are supposed to be detected by the manager
that receives the join request. However, the daemon is interfering with
this by automatically detecting an advertise address and specifying that
to the remote manager. Fix this so that an advertise address is only
specified while joining a cluster if one was given by the user.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit b1d2b088533187954d3b98ed5951ec2dbbb422e9)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 21:02:54 -07:00
Ji.Zhilong d5aaaa7ea3 devmapper: prevent libdevmapper from deleting device symlinks in RemoveDeviceDeferred
if there is no cookie set in dm task, or flag DM_UDEV_DISABLE_LIBRARY_FALLBACK
is cleared for a DM_DEV_REMOVE task, libdevmapper will fallback to clean up the
symlink under /dev/mapper by itself, no matter the device removal is executed
immediately or deferred by the kernel.In some cases, the removal is deferred by the
kernel, while the symlink is deleted directly by libdevmapper, when docker tries to
activate the device again, the deferred removal will be canceld, but the symlink will
not show up again, so docker's attempt to mount the device by the symlink will fail,
and it will eventually leads to a `docker start/diff` error.

Fixes #24671

Signed-off-by: Ji.Zhilong <zhilongji@gmail.com>
(cherry picked from commit 5e505d101f0201a4d045510d0a9b0c66697dedfe)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:43 -07:00
Yong Tang f2a48d2ff3 Fix AuthZ plugins headers change issue
This fix tries to address the issue raised in 25927 where
the HTTP headers have been chaged when AUthZ plugin is in
place.

This issue is that in `FlushAll` (`pkg/authorization/response.go`),
the headers have been written (with `WriteHeader`) before all the
headers have bee copied.

This fix fixes the issue by placing `WriteHeader` after.

A test has been added to cover the changes.`

This fix fixes 25927

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 9cb8fb6ea03fcd78010ce7dd33585d96cd73e38c)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:37 -07:00
Satoshi Tagomori 32b0633f65 Update fluent-logger-golang to v1.2.0.
Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference".
This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes.

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
(cherry picked from commit 87124b9d62bc71f7632126cf7f8d5eb805c4a7f1)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:31 -07:00
Thomas Leonard 5592ee4d07 Fix exec form of HEALTHCHECK CMD
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.

Added a test to detect this.

Fixes #26174

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
(cherry picked from commit e95b6b51daed868094c7b66113381d5088e831b4)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:24 -07:00
Ron Williams f4650e2eb8 Force input stream ANSI emulation for ConEmu.
Signed-off-by: Ron Williams <ron.a.williams@gmail.com>
(cherry picked from commit 0fd4bbda2dfb9a1bfc6781f2a3dacedc62c7c11b)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:18 -07:00