f0cc64a32d
Merge pull request #16364 from wcwxyz/master
...
Preserve /etc/sysconfig/docker across rpm update
Upstream-commit: 4a707c9ad9f5055a090e7402b2ab5e9ee145837f
Component: engine
2015-09-17 13:36:17 -07:00
c5612022ae
Merge pull request #16271 from runcom/deprecate-cli-opts
...
Deprecate -c cli short variant flag in docker run
Upstream-commit: 4702d45599bf69b525a58c804d175732b934591e
Component: engine
2015-09-17 11:52:59 -07:00
ebaf24310f
Merge pull request #16354 from tomdee/patch-3
...
Update the instructions for building experimental docker binaries
Upstream-commit: 96c735a72405a3a8d479b50ec25f91bd72923aa2
Component: engine
2015-09-17 11:50:07 -07:00
2d5e18cda2
Merge pull request #16355 from duglin/DaemonErrors
...
Convert some "daemon" static error strings to the new errocode package format
Upstream-commit: 828e4ac45a5b4954997949570b9b032c57137849
Component: engine
2015-09-17 11:48:37 -07:00
61d5ad0174
Merge pull request #16375 from sunyuan3/makefile
...
from make file to Makefile
Upstream-commit: 57c6012cf0dbe1097b2b876b0fbca5fa6dbf0e81
Component: engine
2015-09-17 10:10:18 -07:00
0203472d5b
Merge pull request #15898 from Microsoft/15775-buildcontextfix
...
Windows: Fix long path handling for docker build
Upstream-commit: cfd3080a8004738c34ecf1ae0e6cd2f82638c78b
Component: engine
2015-09-17 09:19:23 -07:00
3794bfe695
from make file to Makefile
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 5e7895ee2159552ddd65a91f38bd87a1999328a0
Component: engine
2015-09-17 15:37:50 +00:00
3d67e39b1a
Merge pull request #16370 from mountkin/daemon-cleanup
...
remove the unused run() and output() functions in daemon/container.go
Upstream-commit: e33b8b11afd9d2b830ffed11f3c70e7448be1ff4
Component: engine
2015-09-17 17:33:55 +02:00
d13159ba93
Merge pull request #16361 from MHBauer/stats-refactor
...
refactor stats to not use internal data structures
Upstream-commit: cafee2eb4544442cd1307c1484235261b5b2752a
Component: engine
2015-09-17 08:28:07 -07:00
0351ae3d97
Deprecate -c cli short variant flag in docker run
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: e5a26ec0814eebca59ecde38b1aaa5a7de4013fb
Component: engine
2015-09-17 15:48:48 +02:00
863133e1ca
Merge pull request #16372 from runcom/skip-racey-twst
...
Skip racey TestDockerCmdInDirWithTimeout
Upstream-commit: 3b168b29f2d06e492ad598e0ac90f8ad1ec9f743
Component: engine
2015-09-17 09:47:08 -04:00
82cf13a7d1
Skip racey TestDockerCmdInDirWithTimeout
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f1728472059212001450a990468e8c2c6d7e38c9
Component: engine
2015-09-17 15:30:07 +02:00
d6c0223ae2
remove the unused run() and output() functions in daemon/container.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: b79782e9516188e4c6e0d2e20d4a42d91f1c0c3c
Component: engine
2015-09-17 19:22:25 +08:00
b0bf51095d
Merge pull request #16336 from mountkin/fix-hijack
...
error should be checked earlier in the hijack function
Upstream-commit: ffaee8fe78a5e7203b28895788e2aa16b4315b21
Component: engine
2015-09-17 09:38:48 +02:00
e6ff3f627c
Preserve /etc/sysconfig/docker across rpm update
...
Otherwise we have to reconfigure every time docker rpm got update.
Signed-off-by: WANG Chao <wcwxyz@gmail.com >
Upstream-commit: b51918fba18999d415cdc555616cc3076db01842
Component: engine
2015-09-17 12:12:28 +08:00
ee9bd9e809
Merge pull request #15182 from mapuri/build-arg
...
Support for passing build-time variables in build context
Upstream-commit: 1ffff4c8e2b208664b6f63ea6cd3c4c3dace3cc9
Component: engine
2015-09-16 23:52:37 -04:00
c2bb8dcb02
Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
...
log driver - Interpolate fields into log tag
Upstream-commit: 4dfa996cc246691de5e6f509939b96e8643ac228
Component: engine
2015-09-16 23:33:34 -04:00
b23ea59e6d
refactor stats to not use internal data structures
...
- refactor to make it easier to split the api in the future
- addition to check the existing test case and make sure it contains
some expected output
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 2d5d606fd368814ead4ff189eeae264f2af8691b
Component: engine
2015-09-16 17:28:52 -07:00
2f2b741d7b
Merge pull request #16357 from Microsoft/10662-enabledockervolume
...
Windows: Enable docker volume
Upstream-commit: b0b3bc56d05ea1de7d5510dd00bb1cb63ac0b0c7
Component: engine
2015-09-16 16:42:50 -07:00
6295202aba
Convert some "daemon" static error strings to the new errocode package format
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f7d4b4fe2b130a522dee847a657218806180fa52
Component: engine
2015-09-16 16:16:42 -07:00
1f509b7064
Merge pull request #16358 from mrjana/mh
...
Vendoring libnetwork
Upstream-commit: 9ab8c2d92eae410ca765ddda4da4dab236f23153
Component: engine
2015-09-16 15:47:47 -07:00
3cfc4f37fa
Merge pull request #16294 from jfrazelle/cleanup-vendor
...
cleanup vendoring of test deps
Upstream-commit: 0ac28f5e4858ae47a4f452959c722375e587e12f
Component: engine
2015-09-16 15:45:36 -07:00
6e1d19dd58
Merge pull request #16359 from cpuguy83/skip_racey_test
...
Skip racey TestDockerCmdWithTimeout
Upstream-commit: 9a8f1b767314cd61a4f213906a89df319b7736c3
Component: engine
2015-09-16 18:37:14 -04:00
7d7547b76d
Skip racey TestDockerCmdWithTimeout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5cf3a6e01049c6557645e45732c1a04860f1c327
Component: engine
2015-09-16 18:36:35 -04:00
be5aed80c9
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
Upstream-commit: 3394fedf3282aedb16c6f3576e0aec721e7e8286
Component: engine
2015-09-17 00:23:25 +02:00
bd692d4b30
log driver - add ability to interpolate container context into the log tag field
...
Signed-off-by: Philip Monroe <phil@philmonroe.com >
Upstream-commit: 3be7146e14d1f5ced470c0c7e3066f091f468696
Component: engine
2015-09-16 15:19:28 -07:00
af40a9a21d
Merge pull request #16031 from thockin/14069-dns-options
...
Add support for DNS options
Upstream-commit: 5cbcbfc03cc11de8d58dd0977327bb6a8cfc9fa4
Component: engine
2015-09-16 23:59:19 +02:00
dbdbf2ae59
Vendoring libnetwork
...
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: a803148bbac87aec183be38502991bb779196560
Component: engine
2015-09-16 14:48:42 -07:00
10a1fde8b9
Merge pull request #16261 from vdemeester/integration-dockercmd
...
Move dockerCmd to pkg/integration and add tests to it
Upstream-commit: 677a6eaf8f33360e87fb915e632a5d0e8e380dbd
Component: engine
2015-09-16 17:40:33 -04:00
9f76426e0b
Windows: Enabled docker volume
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 42a46ed1a4cd1a6116b3bc5018c29c80db93f928
Component: engine
2015-09-16 14:33:13 -07:00
e7573766cd
Merge pull request #16351 from mavenugo/vin_ln_kv
...
Vendoring in libnetwork and libkv
Upstream-commit: 4a2c3733bd904919c17fbf007361093d87609686
Component: engine
2015-09-16 14:10:49 -07:00
655513db24
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
9ef3eefa22
Merge pull request #16316 from vbatts/vbatts-events
...
daemon/events: let Log be [slightly] blocking
Upstream-commit: b9a3660d1e007a38585e0bb769169ea0911c0e18
Component: engine
2015-09-16 13:57:06 -07:00
72a3863e6b
Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test
...
Skip TestRunDeviceDirectory when no /dev/snd
Upstream-commit: fb01c2ea3cbc723d4f6950f8d004bbc064acd1f3
Component: engine
2015-09-16 13:56:11 -07:00
a067d73ef6
Merge pull request #16305 from estesp/hooks-for-the-hooks-gods
...
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
Upstream-commit: ac34ce0307aeeeba715e16d3cac8e5a7a07a6e1e
Component: engine
2015-09-16 13:55:16 -07:00
7077353720
Merge pull request #16308 from runcom/graph-unparam
...
graph: remove unused functions parameters
Upstream-commit: 5b99591e18d71085619122fc43d8920548b0e6b6
Component: engine
2015-09-16 13:54:23 -07:00
ad5e2fda43
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
Upstream-commit: c1e59b94e2de1f6380dce451886185117bbde06f
Component: engine
2015-09-16 13:43:02 -07:00
767330f121
Merge pull request #15861 from brahmaroutu/gccgo_x86
...
Enable building Docker with gcc-go on x86
Upstream-commit: 74a8f2f668380d800c3ecce30fe509d997f9b106
Component: engine
2015-09-16 13:29:02 -07:00
8de554f648
Update the instructions for building experimental docker binaries
...
There is no dynbinary target.
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: f9e9a622f08def0e7f7581dc0bec1de39fcbf56e
Component: engine
2015-09-16 13:18:32 -07:00
63f5d12fc4
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
Upstream-commit: bfc4e38429baec7414364bbe20787245d3f2b432
Component: engine
2015-09-16 13:17:10 -07:00
6ad0539e3d
adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
...
temporarily disabling registry builds as crypto package is broken with gccgo.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2c53643b33fbba5851afcc7067117a7b75cc5dbb
Component: engine
2015-09-16 18:56:01 +00:00
7ff16017f2
Vendoring in libnetwork and libkv
...
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
(Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516 )
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 814c19591d875a747433f87ae84dffbf58c4d21a
Component: engine
2015-09-16 11:54:28 -07:00
28003be63b
Skip TestRunDeviceDirectory when no /dev/snd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 88b895111b57e49b4cdb9c3965e87925ad8947fa
Component: engine
2015-09-16 14:43:30 -04:00
5e58ae50d3
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
Upstream-commit: 259a0fb16ceac921763172127183059dea7e3c46
Component: engine
2015-09-16 20:29:16 +02:00
c2bbdd98b1
Clarifying use of flag
...
Updating with Seb's comments
Updating with comments from review
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a2f545c86d37635d3a9f8fa869356218d6991c16
Component: engine
2015-09-16 11:22:40 -07:00
5b99d6a57b
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
Upstream-commit: 60db152b209ede8e463b74459902f02d8d44e097
Component: engine
2015-09-16 11:18:17 -07:00
da0763c0bb
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
Upstream-commit: 552c361f3988993c43698fdaa8607a2830c9f567
Component: engine
2015-09-16 10:01:11 -07:00
fd675380c0
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
e3b5e8b7ff
Update native execdriver to exploit libcontainer hooks
...
Using @mavenugo's patch for enabling the libcontainer pre-start hook to
be used for network namespace initialization (correcting the conflict
with user namespaces); updated the boolean check to the more generic
SupportsHooks() name, and fixed the hook state function signature.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: e148e763b8e7879855022690fdea88a6bf869195
Component: engine
2015-09-16 12:51:14 -04:00
27422ef1df
Fix bash completion when extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0a5aac1ff6cbacfeefb34702b4726a4e189b1bb9
Component: engine
2015-09-16 18:17:40 +02:00
