00f07a55d3
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7ae2a372d6d845040cdf40b246f4eec62512398
Component: engine
2015-05-12 14:41:02 -07:00
aaf186c8e8
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: aed8f9f76e16ed7acc49fbdef5f4563834ac5167
Component: engine
2015-05-12 14:26:57 -07:00
fe20784d8c
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
Upstream-commit: 37cb2a15bf05f8d0b12423230f57998e90d5d8a2
Component: engine
2015-05-12 13:52:49 -07:00
de6eaa3d3d
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
Upstream-commit: cb53a628b0b722cac24586bd3bef578a5a8e6ed8
Component: engine
2015-05-12 13:49:47 -07:00
ebd56edbe7
Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter
...
modprobe br_netfilter
Upstream-commit: e0777e69cba057d7c7da360ed2745d9de8b61ed2
Component: engine
2015-05-12 13:46:34 -07:00
ac35a75674
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
Upstream-commit: f35038dfba2bae0f2183a0caa366e8d7cb959220
Component: engine
2015-05-12 13:08:36 -07:00
b1b57c9cd4
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 3a8728b431df07249ad913ea9a12e27dc39b8956
Component: engine
2015-05-12 19:11:52 +00:00
15c4056588
Merge pull request #12847 from cpuguy83/fix_firewald_errors
...
Fix error message on firewalld init
Upstream-commit: b0518fe0383bff573f8743d179b1cd6df9f5e1e1
Component: engine
2015-05-12 12:01:59 -07:00
a641944b1d
this fixes hairpin nat tryinng to ping a the host and port from inside a container
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 4800d4df8c25b0403482bb3ea55891b7091d89f9
Component: engine
2015-05-12 11:57:36 -07:00
b33908cc47
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
Upstream-commit: 73387bf15a3f3a35192cb78aefa5c32e1569cb5c
Component: engine
2015-05-12 11:36:55 -07:00
c0a71ed02d
Merge pull request #13127 from shishir-a412ed/exec_opt_doc
...
Missing exec-opt[] option in CommandLine docs
Upstream-commit: 5bf2ebf0a5d6eb9043d32dfcee7a4c8beb4e4a7f
Component: engine
2015-05-12 11:34:51 -07:00
4a0ddadbc0
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
2015-05-12 20:09:49 +02:00
2535832c36
Merge pull request #13141 from vieux/fallback_inspect
...
fallback to interface with docker inspect
Upstream-commit: d4eba300657cc60ca03fe774bb42ad6b6f9eca54
Component: engine
2015-05-12 11:02:06 -07:00
ab6ce6666a
Merge pull request #13151 from Mic92/master
...
zfs: update filesystem cache on filesystem creation/deletion
Upstream-commit: 445afe09770bccbb9929f5e05c47d73a1d59298a
Component: engine
2015-05-12 10:53:01 -07:00
792a1ace8a
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e3ba3dd5b828307c3970d0036b019eca405e4a2c
Component: engine
2015-05-12 13:50:51 -04:00
f387cad768
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
Upstream-commit: c9821d8dd629cbd4fc0b11c9f593267042c2d718
Component: engine
2015-05-12 10:32:01 -07:00
baa93a3d54
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
2015-05-12 10:27:43 -07:00
e45f408b7c
Windows: Start of daemon config refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b3bca3afc9914de27741a86ac062aea4c5ba825b
Component: engine
2015-05-12 09:50:32 -07:00
b60e82567d
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
2015-05-12 09:40:16 -04:00
9a838129e5
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 2cb23527e4f3f74a9fb98ddc7c0c11c50c3f07d2
Component: engine
2015-05-12 13:06:41 +02:00
71b540c581
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a8250a0b20006bae669f9d127eaf00d4284e1d9f
Component: engine
2015-05-12 18:02:30 +08:00
6a33f440dd
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
Upstream-commit: a5007e5737fac5904b61f49c8a7fd6fc29f83330
Component: engine
2015-05-11 21:20:44 -04:00
b969f88e8d
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 52c3bb6a0ec35f34550944b8895d7727301791c9
Component: engine
2015-05-11 17:39:21 -07:00
c0e7d1e48e
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 95fcf76cc64a4acf95c168e8d8607e3acf405c13
Component: engine
2015-05-12 10:09:23 +10:00
5a91f639c0
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
b4bae162cd
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
Upstream-commit: c49695f976ab97dc8c7a249f5211d9e0fcb2c24c
Component: engine
2015-05-12 09:07:55 +10:00
56b6d8326b
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c5e93d095005e8b336b845cb94d95f55a594b3ce
Component: engine
2015-05-11 23:07:22 +00:00
d3339de046
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 78604a9f3fc7d08b39fea0e80dafaa6f8472b050
Component: engine
2015-05-11 15:28:08 -07:00
8422b7afff
Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
...
DHE 1.0.1 release
Upstream-commit: 34b976953824f5ec0237e6dc2d6c147a0547e992
Component: engine
2015-05-12 07:34:30 +10:00
133eb58df5
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
2015-05-11 21:23:56 +00:00
478cbff61d
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
Upstream-commit: a47fb5edca77536ea6ea024df0bc15978d172224
Component: engine
2015-05-11 14:01:07 -07:00
c578ab5fb7
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ca7219f5daa194ae714c3a3396703e08d8a137c8
Component: engine
2015-05-11 13:23:50 -07:00
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
7820b09f20
Missing exec-opt[] option in CommandLine docs
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 98277f3cad55e68aa730ba40cb375b268ee794e6
Component: engine
2015-05-11 15:41:50 -04:00
a9a448c762
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
Upstream-commit: e66ad40c4e62d784e23e0df39de0970c5ced3917
Component: engine
2015-05-11 11:24:43 -07:00
12071c528f
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e2acca67c8e089429c8a5d5171887e5de42e3917
Component: engine
2015-05-11 19:56:41 +02:00
ceedb9d4b8
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
Upstream-commit: 5e063326a345349b406791a6822f6423e17c353d
Component: engine
2015-05-11 10:54:39 -07:00
203bb4326e
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
Upstream-commit: 92344602eadd6500f9936593772e46cf7db2b518
Component: engine
2015-05-11 10:42:59 -07:00
365c18080f
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
8647686396
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
Upstream-commit: 4d6720bfbb0a2f88d4733ca2a3103e3160d0cd33
Component: engine
2015-05-10 13:43:27 -04:00
240f5e3960
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
Upstream-commit: 13064646a64cdc6772fe05ac4445d1498d76656a
Component: engine
2015-05-10 09:22:44 -07:00
9784ed801a
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com >
Upstream-commit: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
2015-05-10 08:11:26 -07:00
abc1b2f1ff
Fix oom kill disable issue
...
It should not be hard limit, we should only check oom kill disable
when user using it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a2f39e7754c5ca1245cc268472ecb92147ba21fa
Component: engine
2015-05-10 14:55:00 +08:00
fc89bcb4ca
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 8c1ef5ceafcba2476693db7f5db39300ad2e7f88
Component: engine
2015-05-10 00:16:54 +05:30
a40ebffc52
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
Upstream-commit: 340fd140e67901c8b5ad9d59c6fb693f6bbcffde
Component: engine
2015-05-09 09:42:27 -07:00
ab315ef02f
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
c55979eeda
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
Upstream-commit: 61cb6012e6b4085f9c867d826431368bb18896c8
Component: engine
2015-05-09 09:38:42 -07:00
52da2e9683
Fix RUN err msg (again)
...
Previous fix used %q which incorrectly go-escaped things. For example:
```
RUN echoo A \& B C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character
The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 006c066b6ce0b8b16f7d68b0ef997717bfb35662
Component: engine
2015-05-09 09:22:30 -07:00
104194a4ef
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dd4693f67cb0ce5dc14c87ddf2a9a9f6a3406763
Component: engine
2015-05-09 05:56:10 -07:00
