f157b240b8
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
d1559e41df
Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
...
Correct the message of pause and unpause a non-running container
Upstream-commit: 835f1c91161db45ed18683b5d75685dea0c5dc2c
Component: engine
2015-06-15 23:56:32 +02:00
4cf65f9e74
Merge pull request #13869 from jlhawn/multi_line_help_usage
...
api/client: Allow for multi-line usage help
Upstream-commit: 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Component: engine
2015-06-15 14:50:17 -07:00
7262d63bf2
Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
...
Store layer digests on pull
Upstream-commit: b3b04fd85a5a44182c872a2765e6732bf9f05a39
Component: engine
2015-06-15 14:37:30 -07:00
9a276424db
retooling for hugo
...
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
8b238203a5
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
Upstream-commit: 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Component: engine
2015-06-15 11:25:35 -07:00
778f11fd97
Store layer digests on pull
...
Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.
Fixes #13883
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a98ea87e463383a77d7244c78c9da3ac9f2cd086
Component: engine
2015-06-15 11:08:21 -07:00
974ab12463
Revert "contrib/init: unshare mount namespace for inits"
...
This reverts commit b6569b6b82df4c5e29ee8f5ebd9db7e36919cefd.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d8592eaff8bddb6f29c48cc39dec70db884eda00
Component: engine
2015-06-15 10:35:17 -07:00
b4ed480d0e
Merge pull request #13926 from Microsoft/10662-createfixup
...
Windows: Fixup compile in daemon_windows.go
Upstream-commit: 1157fcc4a4e775a0b6f2dfc9c0c25fcbc453e1a8
Component: engine
2015-06-15 10:17:24 -07:00
f29d02bba3
Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
...
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
2015-06-15 16:25:59 +02:00
98d6dbe3a1
Merge pull request #13927 from moxiegirl/carry-13250
...
Carry of PR #13520
Upstream-commit: ee40f297122b6998e35cf0992c96dd559ea41b26
Component: engine
2015-06-13 10:29:56 -07:00
5dbd4e8b23
Merge pull request #13895 from calavera/fix_get_env_split
...
Correct getEnv split.
Upstream-commit: f27c9bc6e79db23432e84287bbeae9b307e405d0
Component: engine
2015-06-13 12:43:45 -04:00
57eb64c9c0
Carry of PR #13520
...
Removinig files
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
2015-06-13 09:27:30 -07:00
cd985d0b5e
Merge pull request #13860 from jlhawn/cli_call_headers
...
api/client: have cli.call() return headers
Upstream-commit: cd36b15ccb8561de95ee2e018baa778316da4423
Component: engine
2015-06-13 09:14:40 -07:00
e00434b7ab
Windows: Fixup compile in daemon_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c7975f12d6bcdac2812554c4d9ec88820ffe0e61
Component: engine
2015-06-13 09:10:54 -07:00
7766f90256
Merge pull request #13682 from mavenugo/ln_vin
...
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
Upstream-commit: 261af00282fac3e37d1d0018f1a926b84641625d
Component: engine
2015-06-13 09:00:33 -07:00
2046248b9d
Add verify config to verifyContainerSettings
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: b37832e353327481579cbe2709f63a34453bf83b
Component: engine
2015-06-13 09:31:19 +08:00
1a52506c99
Merge pull request #13749 from Microsoft/adduseragent
...
Add GOOS in User-Agent
Upstream-commit: 422fa7f0a6c27e73125dd1f25de02198033e313e
Component: engine
2015-06-12 17:19:51 -07:00
8931d825f6
Merge pull request #13344 from hqhq/hq_fix_arm64_test
...
Fix unit-test build error on ARM64
Upstream-commit: 39bf57e085d3632b2f03b26a4b9dc900d88b164c
Component: engine
2015-06-12 17:11:18 -07:00
967010d7ff
Merge pull request #12833 from burke/faster-changes
...
Optimize archive.ChangesDirs on Linux
Upstream-commit: 6a7a7570bb50c3127931e012d19d10b8837d95ac
Component: engine
2015-06-12 17:05:34 -07:00
7832a73409
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
...
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 083300168fb0f42e022e9fa2ce47a7b2aac9967a
Component: engine
2015-06-12 16:10:40 -07:00
17239ccea8
Update plugins.md
...
Fixed broken link.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugins.md
Some other broken links!
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugin_api.md
FIxing broken links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugins_volume.md
Fixing more links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Upstream-commit: 0a529b6e7ad33dc05a154861061cf498e1350516
Component: engine
2015-06-12 15:38:15 -07:00
7f7a52e645
Windows: Patch up compile after adjustCpuShares
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d2c5fcc8d5ada5e2f33562ca9f7a9b05d0b01676
Component: engine
2015-06-12 13:00:59 -07:00
1b642fbf03
Merge pull request #13912 from icecrime/13902_improve_test
...
Replace "sleep" by "top" in test implementation
Upstream-commit: 5bddafe16938ee4af4c1f3e7380e82a610a9242d
Component: engine
2015-06-12 20:24:31 +02:00
06662e40d0
Merge pull request #13494 from Microsoft/10662-vfsdriveroption
...
Windows: Allow VFS
Upstream-commit: e7533d7f81fdb3d33efd91c751d25b9d3b80f4e1
Component: engine
2015-06-12 11:12:32 -07:00
5210044242
Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp
...
Fixes content-type/length for stats stream=false
Upstream-commit: 27e2837c6cd2c0d9b9ff9a0fda943a15b7162798
Component: engine
2015-06-12 19:53:18 +02:00
f2616f1d40
Replace "sleep" by "top" in test implementation
...
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e5b7f61f090bfc951590dd5dad3f6bb1ce3888ba
Component: engine
2015-06-12 10:45:42 -07:00
2f9ce60f71
Merge pull request #13902 from ibuildthecloud/api-fixes
...
Set omitempty for IP and PublicPort to conform w/ API 1.18
Upstream-commit: 235155760788651cbde9eb9a6e0adca444a64267
Component: engine
2015-06-12 10:42:07 -07:00
73dfc7d473
Fixes content-type/length for stats stream=false
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 855a056af7829504ccc310587445c61d62427b51
Component: engine
2015-06-12 13:06:06 -04:00
1bda4f96e2
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 09de92b891c15bda593cf47617f032d2b0b40605
Component: engine
2015-06-12 09:49:53 -07:00
01cbc209ac
Windows: Allow VFS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e89f837bc6a26e08e02f25b6e474d4ad7bdfb101
Component: engine
2015-06-12 09:21:17 -07:00
7312221753
Merge pull request #13899 from mavenugo/hp
...
Vendoring in libnetwork to fix #13873 .
Upstream-commit: 5a02d0727bab071e270cf02521192a7d1d257b69
Component: engine
2015-06-12 07:27:07 -07:00
d5f9011393
Merge pull request #13906 from chenchun/closed_chan
...
Fix send on closed channel bug
Upstream-commit: c98eafe564b1828fb894749c33a8864257034af2
Component: engine
2015-06-12 09:37:53 -04:00
b983713c50
Vendoring in libnetwork to fix #13873 .
...
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3d1826350d5624f1e82d764d2367a4584f04465
Component: engine
2015-06-12 04:58:37 -07:00
52d3c50217
Fix send on closed channel bug
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
Upstream-commit: a408790de8f317d79fb52acb3a5220846a0ffcba
Component: engine
2015-06-12 15:42:34 +08:00
4a122abf80
TestExecStopNotHanging: log output as string
...
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: d898372568a3e00d4bda0359393d833a9f30fe1d
Component: engine
2015-06-11 22:53:55 -04:00
3e78e2ecb7
Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation
...
refactor: separate graph from image
Upstream-commit: 00b8fec75f3a113c851013e0f0d559cc6d96b84d
Component: engine
2015-06-11 17:44:37 -07:00
61e1950d67
Correct getEnv split.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 85f895ce681ebbc3a1990ef73875cf94b5c77d17
Component: engine
2015-06-11 14:40:46 -07:00
b25a623fe3
Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI
...
Adjust disallowed CpuShares in /containers/create
Upstream-commit: 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Component: engine
2015-06-11 14:20:50 -07:00
d86641ad8d
Merge pull request #13801 from bexelbie/bex_manpage_indention
...
Updates man page generation to use go-md2man v1.0.2
Upstream-commit: 0de7065897573551bb23ead8d1d21d22e7657f17
Component: engine
2015-06-11 14:12:17 -07:00
239317c5c8
Updating with fix for first line and the vieux/amy comment on website
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 566466e71402b1d75412061d6ee80b07bb8e37b1
Component: engine
2015-06-11 12:48:01 -07:00
f4886b8583
Merge pull request #13865 from Mic92/zfs-selinux
...
zfs: correctly apply selinux context
Upstream-commit: cada9b54b52246fd284e3025da5ad936a7521c1c
Component: engine
2015-06-11 12:42:06 -07:00
1e82333db2
Update "vendor/"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b0d748325f1eaae8d4f138b5785307cef2a784d3
Component: engine
2015-06-11 09:59:12 -07:00
af029cbed5
Add intelligent vendor pruning (via "go list")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9e4ee3dea52ec0615f59c729ed972d08732a3edd
Component: engine
2015-06-11 09:59:12 -07:00
67781f5191
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: f61d595b55b48428b7268b85a23b6e61b649f6d9
Component: engine
2015-06-11 09:59:12 -07:00
7f3cb67fc1
Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string
...
Display empty string instead of <nil> when IP opt is nil.
Upstream-commit: b27f9605043377b46ecd7b983bea0e46da78cab7
Component: engine
2015-06-11 09:30:52 -07:00
8634848db8
Merge pull request #13839 from eolamey/13838-fix-docs-url
...
Fix docs URL not using https.
Upstream-commit: 9001c4bc486934f91d5809b335232875e639dafb
Component: engine
2015-06-11 08:59:35 -07:00
6bfaa80cf5
Merge pull request #13861 from mrjana/cnm_integ
...
Vendoring libnetwork to fix stale arp cache issue
Upstream-commit: 4fc6449944901d0c696ddeb296434871d196ec20
Component: engine
2015-06-11 09:12:34 -04:00
bdb3371188
Display empty string instead of <nil> when IP opt is nil.
...
Fixes #13878 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 9ad89281aeb31d251f97af7ea419d5ca865b8199
Component: engine
2015-06-11 11:14:28 +00:00
cbae4c5fe4
Merge pull request #13590 from mountkin/fix-archive-tests
...
Add the parent directory to changes set if new files are generated
Upstream-commit: ef171afdbb8b766216eb87be51afe6243820a266
Component: engine
2015-06-11 05:12:45 -04:00
