Commit Graph

42337 Commits

Author SHA1 Message Date
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
Anusha Ragunathan 5619e72a34 Add retry logic during aufs unmount.
Treat EBUSY as a transient error and retry. Also stop ignoring unmount errors.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 0e539fec331cb9dbc4ef784b55516570b11affe2)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:35:12 -07:00
Brian Goff a1d191d91e re-vendor syslog package
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f528690674712b680caf2712092c7e2f8f236491)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:34:59 -07:00
Misty Stanley-Jones 708a93a800 'docker node inspect <node> --pretty' needs an extra newline at the end
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 341489f1500873a6aa51998f49c1da7f7fd8eb5a)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:34:11 -07:00
Alessandro Boch 2be91b121b Vendoring boltdb @fff57c100
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 5cfbdceafe87df8bab85c0561a1483d3191eb775)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:34:04 -07:00
Yanqiang Miao 0dcd2e1a5d Remove the support of setting host configuration options when the container starts
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
(cherry picked from commit 26b6b47420be3e0d932a5e128ac2304b9e93efc2)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:58 -07:00
Yong Tang e892a54fa1 Fix incorrect help output in `docker network ls`
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit b9e46235fadc6b390e2c04c44b6a865e4ea97cb8)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:52 -07:00
Misty Stanley-Jones 24df982128 Clarify usage of --force when used on a swarm manager
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 7b5c3d935a7a99b282f0f859101c887894a0b00e)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:45 -07:00
Liam Macgillavry fd7e763e7c missed DOCKER->DOCKERD change in 1ac1b78b3a for 'status'
Signed-off-by: Liam Macgillavry <liam@kumina.nl>
(cherry picked from commit 11eda60848e476c3a1d84a035642edba74e94c8a)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:36 -07:00
Christopher Jones 132a8e7963 ppc64le: remove go SHA check
Makes it consistent with other Dockerfiles.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit d9e12cba5a9a2291f56eb3921b06ac1b5f85dfc7)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:30 -07:00
Michael Crosby aaaeb84ac6 Check for non-nil container after match
There can be a race between getting the container ids for matches and
getting the actual container.  This makes sure that we check that the
container returned by `Get` is non-nil before adding it to the list of
matches.

Fixes #25991

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit a020ec4c8b476a814eb137e216fe9d723524fc3b)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:23 -07:00
Nathan LeClaire e18a9193d4 Bump version to 0.8.2
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-26 14:41:17 -07:00