a3521c2e7e
fix in daemon side
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
goformat
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix small
Signed-off-by: Zhang Kun <zkazure@gmail.com >
change to rm
Signed-off-by: Zhang Kun <zkazure@gmail.com >
handler other error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
unique ERR
Signed-off-by: Zhang Kun <zkazure@gmail.com >
setHostConfig_fail_test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
format
Signed-off-by: Zhang Kun <zkazure@gmail.com >
err handle and modify test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
golint error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
2015-08-18 10:06:36 +08:00
427a3b4bda
Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
...
Update dev machine name to default in mac installation docs
Upstream-commit: 66112a7ae5313aff70ed5aebc2ed9d9ba2265d85
Component: engine
2015-08-17 19:05:34 -07:00
a2576f3ffa
Merge pull request #15380 from calavera/remove_sys_info_pointers
...
Remove pointers from the SysInfo struct.
Upstream-commit: f1da5edc8b1404a302b02d38a60bba91c4bcd965
Component: engine
2015-08-17 18:40:54 -07:00
dd213d0178
Merge pull request #15430 from charleswhchan/patch-2
...
Cleanup "Working with containers" page.
Upstream-commit: 5ab6883b9228a960052a0812b8529614937c66d3
Component: engine
2015-08-17 17:46:05 -07:00
7a8e3f26ae
Merge pull request #15650 from LK4D4/fix_max_file_error
...
Fix error message in max-file validation
Upstream-commit: fd2e945d155e7506ece7f3ada867b06a2eff7656
Component: engine
2015-08-17 20:27:12 -04:00
39fa3c5eb8
Merge pull request #15632 from mountkin/fix-15626
...
a quick fix to #15626
Upstream-commit: 1c916dbd8359beb9db14f2688879977db86b2c1d
Component: engine
2015-08-17 20:26:47 -04:00
f00550c0b6
Merge pull request #15599 from calavera/ps_format_q
...
Fix ignore `-q` flag in `docker ps` when there is a default format.
Upstream-commit: 29ced5d0c4d67b3609c95bc039589009086852b3
Component: engine
2015-08-17 15:44:28 -07:00
3107abf81b
Fix error message in max-file validation
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cde607108badc84ddb6a7e2d2f75ce31be9967a5
Component: engine
2015-08-17 15:34:39 -07:00
5bfc44e34c
Merge pull request #15292 from mountkin/fix-exec-test
...
move the assertions outside of the goroutine
Upstream-commit: 5c88a6fdcaa264845e5ad07f57222f750e213520
Component: engine
2015-08-17 17:24:58 -04:00
40dd394833
Merge pull request #15611 from mariussturm/master
...
Initialize LogConfig in daemon mode
Upstream-commit: aef15ffc5da5d872476c068f7820f196b5a027ea
Component: engine
2015-08-17 14:17:54 -07:00
ff003f32f9
Merge pull request #15356 from Microsoft/10662-uncpathonbuild
...
Windows: Allow UNC paths on build
Upstream-commit: 436fca704f7cf14b85d1b9324033a1a778d75134
Component: engine
2015-08-17 13:34:27 -07:00
f3a123c54b
Windows: Allow UNC paths on build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: df7ab6f3dbec85c1cf32b36c4c7dcfdc374f6566
Component: engine
2015-08-17 11:03:54 -07:00
c19232ca91
Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
...
Fix `inspect` output when no log driver specified
Upstream-commit: 5aeb48af7702be78774c36cfabbda1b3bf1c7b34
Component: engine
2015-08-17 11:03:37 -07:00
4c6bab5f50
Fix ignore -q flag in docker ps when there is a default format.
...
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: df46bfdd4d28dcab432b2fc6c36131ff95223148
Component: engine
2015-08-17 10:48:04 -07:00
d9d9dff9a7
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
Upstream-commit: 2e7b088164960b7981a058f34336c05dc52f2c53
Component: engine
2015-08-17 10:45:48 -07:00
f403372672
Fix inspect output when no log driver specified
...
Config options were being ignored in the inspect output when no driver
was specified.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
2015-08-17 11:35:34 -04:00
e353ad2a0e
a quick fix to #15626
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 3977f30869fad2c679d7913ce968add7c7987282
Component: engine
2015-08-17 21:35:57 +08:00
63ab074ee2
Merge pull request #15237 from charleswhchan/patch-3
...
Reformat /containers/(id)/resize to make it consistent with other sections.
Upstream-commit: bba762b19254b8315aa8d5a6a63cb00253eaa42c
Component: engine
2015-08-16 10:59:16 +02:00
5ba2c88bd5
Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 6cd2d8946902eddab5e3902efeef3c7ffd748a1e
Component: engine
2015-08-15 19:47:01 -07:00
f2f5327a6e
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
15e6133b8f
Update dev machine name to default in mac installation docs
...
Signed-off-by: Michael Grauer <michael.grauer@kitware.com >
Upstream-commit: f26045a53457fd99b0d5f20817f8b7b25db8b6d0
Component: engine
2015-08-15 15:56:41 -04:00
a78072668a
Initialize LogConfig in daemon mode
...
Signed-off-by: Marius Sturm <marius@graylog.com >
Upstream-commit: e904cbec03654765d65a29d6709d84ee43c7bde8
Component: engine
2015-08-15 18:06:03 +02:00
693321afeb
Cleanup "Working with containers" page.
...
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 2fcae333e840ee513702cebed0b6a41e8915263c
Component: engine
2015-08-15 08:44:56 -07:00
73f39654a9
Windows: Graph remove custom interface and add central store
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Windows: add support for images stored in alternate location.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: dfbb5520e3b35030f3eef38d5a2d86ad20ea0a2f
Component: engine
2015-08-14 23:45:53 -07:00
47be27e424
Merge pull request #15602 from Microsoft/10662-blockfromscratch
...
Windows: Block 'FROM scratch'
Upstream-commit: a6e0a6852dbfaa29ec76e9fcfd1bd7f9c499afbe
Component: engine
2015-08-14 21:12:15 -07:00
8118199b84
Merge pull request #15601 from mrjana/vendor18
...
Vendoring in vishvananda/netlink
Upstream-commit: 167783eb137bbf453e3228e12b2cb82fec8ab387
Component: engine
2015-08-14 20:22:54 -07:00
28513048f1
Merge pull request #15598 from cpuguy83/15570_fix_exec_tty
...
Fix issue with exec TTY caused by 15446
Upstream-commit: bd9cc788d0245fe1fcd3370dd8a55eb94f781665
Component: engine
2015-08-14 19:43:04 -07:00
49c0f6d3fb
Windows: Block 'FROM scratch'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6df6e2e405a08bac2a81639349bc9a20c6014619
Component: engine
2015-08-14 18:17:19 -07:00
7c6dc2bb99
Vendoring in vishvananda/netlink
...
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 7948b755c77a3901ffb5b397659c72ae4e6f4340
Component: engine
2015-08-14 18:02:58 -07:00
fa48a1ffaf
Merge pull request #15595 from estesp/build-experimental
...
Add info on how to build experimental binaries
Upstream-commit: 837a66e79b0d458ba12a2ff7bd0ade2770ba9e71
Component: engine
2015-08-15 01:32:10 +02:00
57a36297f7
Fix issue with exec TTY caused by 15446
...
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5ffcecf130aea8c0b92d1be728e2c302cf2c6c70
Component: engine
2015-08-14 14:55:26 -07:00
6d118e9c38
Merge pull request #15428 from charleswhchan/patch-1
...
Improve/fix "Dockerizing Applications" page.
Upstream-commit: aedd45346a19f9d06ebeec9ca7117a104e0c23c1
Component: engine
2015-08-14 14:03:11 -07:00
ac8160b56d
Merge pull request #15525 from albers/completion-option-updates
...
Updates to bash completion for docker run and docker daemon.
Upstream-commit: 313b37129a585f064d32ebf0c4e1a938a0d1fa2c
Component: engine
2015-08-14 13:55:11 -07:00
d18dfea156
Add info on how to build experimental binaries
...
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 3f8d60ac2f7c62aa9b9128af0ebbb9aa1bad6ad1
Component: engine
2015-08-14 16:45:38 -04:00
3ee405c46c
Merge pull request #15568 from Microsoft/10662-commitrunning
...
Windows: Stop commit on running container
Upstream-commit: 424fa598597bd6d716d50dde076b0f4830b60ff8
Component: engine
2015-08-14 13:13:42 -07:00
809e0fd73f
Merge pull request #14530 from Microsoft/10662-serversidevalidation
...
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
2015-08-14 16:05:59 -04:00
da7258ee55
Move netmode validation to server
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f6ed590596cbf73764b40ff4f32f90b1cdb8b213
Component: engine
2015-08-14 12:17:41 -07:00
d4057c5dec
Merge pull request #15580 from hqhq/hq_fix_NETPRIO_check
...
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Upstream-commit: 53b1f993ab46cd229e2d765525f8cd09a8692800
Component: engine
2015-08-14 12:03:03 -07:00
e91a683ee8
Merge pull request #15584 from mavenugo/ln-vendor-in
...
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
Upstream-commit: d1fada4bf7331bda6e45d827a07a2f0438ac8acf
Component: engine
2015-08-14 11:56:47 -07:00
5c54eac36d
Merge pull request #15519 from albers/changelog-dangling
...
[Fix 15518] wrong feature description in changelog
Upstream-commit: f39323c1e3e1de1bfc19ea436cfc8272c54193e0
Component: engine
2015-08-14 20:48:48 +02:00
dee8618b49
Merge pull request #15524 from veggiemonk/patch-README
...
update README.md
Upstream-commit: 575a104b3f98799ddd3a3fbd1172748ae3d23a64
Component: engine
2015-08-14 20:45:40 +02:00
b867f2e185
Merge pull request #15542 from MHBauer/rundoclink
...
fix link
Upstream-commit: d1585f1d6610c36d3d0ba93421ed605d9fd9931d
Component: engine
2015-08-14 20:35:51 +02:00
6c82403d31
Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
...
Fixing race condition on private key backup how-to
Upstream-commit: 424702b91ac31a5caaad0a2c97693db87170d40f
Component: engine
2015-08-14 11:26:56 -07:00
f739b706e0
Merge pull request #15576 from estesp/hows-about-a-minor-typo
...
Correct readability of --userland-proxy para.
Upstream-commit: ff155ce6eeb696b057bc62f5b8e7e2315b95bff3
Component: engine
2015-08-14 11:26:21 -07:00
0f5d7b6011
Merge pull request #15491 from Microsoft/10662-fixtar
...
Windows: [TP3] Fixing Tar functions to support long paths.
Upstream-commit: 28a17c8a035b05d26f01dcd51b1e20b870ec7fa5
Component: engine
2015-08-14 09:41:42 -07:00
89380524e8
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
...
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 703e2264bae99784496794365ea72348715e7c70
Component: engine
2015-08-14 05:57:47 -07:00
1e7e48f2b6
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
...
Fixes : #15572
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 6c4d4c70c6618fc84fc815d14c92ea60f0be538e
Component: engine
2015-08-14 14:38:48 +08:00
b4d25ce7ed
Merge pull request #14758 from Microsoft/10662-pipestohcs
...
Windows: [TP3] new hcsshim stdin/out/err handling
Upstream-commit: 693ff58cd2db719884577c7573e7f74ade8a3e50
Component: engine
2015-08-13 22:52:48 -07:00
880ecdb34d
Windows: Stop commit on running container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4b933dd2eaae17e4931b7414e3cead370124ec5a
Component: engine
2015-08-13 22:17:03 -07:00
2ad32c4a2a
Correct readability of --userland-proxy para
...
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 4e53e80934f1813ff3e66d69fc931ed59707ffc6
Component: engine
2015-08-13 23:56:42 -04:00
