40adb3fd2c
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
2015-09-23 15:38:38 -07:00
c0c941627a
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
2015-09-23 15:29:48 -07:00
871daf5498
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
2015-09-23 15:29:06 -07:00
200fa6978c
Merge pull request #16518 from unclejack/bump_go_to_1.4.3
...
Dockerfile: bump Go to 1.4.3
2015-09-23 15:21:06 -07:00
78de066a28
fix content-type of response for `/commit`
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-09-23 23:49:16 +02:00
8d69e0eae0
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
2015-09-23 17:20:34 -04:00
8f8cc077d3
Merge pull request #16525 from icecrime/fix_integration_cli
...
Fix integration cli
2015-09-23 13:52:28 -07:00
ce092ed08e
Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot
...
Do not try to guess "docker" in Debian SysV init script
2015-09-23 13:46:19 -07:00
04e1015aa0
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:15 -07:00
03dce24137
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:08 -07:00
ec4b71b64a
Merge pull request #16503 from carolfh/image-mag
...
Image mag
2015-09-23 12:43:20 -07:00
8f7f0f8deb
Merge pull request #16493 from cpuguy83/doc_plugin_rpcgen
...
Add README for pluginrpc-gen
2015-09-23 15:36:05 -04:00
3e6991f35c
fixed jira DTR-1173 typo in link and additional edits
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
2015-09-23 12:33:45 -07:00
70016198ce
Merge pull request #16522 from jfrazelle/zypper-wtaf
...
fix zypper wrt interactive
2015-09-23 10:30:58 -07:00
d265f93f6e
fix zypper BS wrt interactive
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-23 04:48:06 -07:00
01c5cfcc56
Do not try to guess "docker" in Debian SysV init script
...
On boot, the init script is invoked from `/etc/rcN.d/S20docker` (where N
is the runlevel). Consequently, the init script tried to find the
defaults at `/etc/defaults/S20docker` and the binary at
`/usr/bin/S20docker`. This causes the docker daemon to fail at boot with
the error
/usr/bin/S20docker not present or not executable
Starting it manually works because it invokes `/etc/init.d/docker` which
has the correct basename.
Fix this by hardcoding "docker" as the base name.
Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2015-09-23 11:27:34 +00:00
34e41580f9
Dockerfile: bump Go to 1.4.3
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-09-23 12:34:00 +03:00
7acd3ca79d
Add README for pluginrpc-gen
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-22 19:34:44 -04:00
b0dc11127e
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
2015-09-22 15:59:49 -07:00
14e8949dcf
Merge pull request #16492 from albers/completion-compopt-mac
...
[Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS
2015-09-22 15:58:56 -07:00
9dc0973655
Merge pull request #16331 from calavera/server_middlewares
...
Organize server pre-func logic in middlewares.
2015-09-22 16:10:42 -05:00
04d76d898a
Merge pull request #16312 from Microsoft/10662-startwindowscli
...
Windows: First part of CI tests (docker run)
2015-09-22 15:37:33 -04:00
9d8f9943e9
Bash completion: avoid 'compopt: command not found' errors on Mac OS
...
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.
If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-22 12:17:30 -07:00
114612305c
Merge pull request #16235 from HuKeping/oom-event
...
Events for OOM needs to be shift to an earlier time
2015-09-22 11:50:30 -07:00
8a5ab83df8
Windows: First part of CI tests (docker run)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-22 10:24:03 -07:00
bfc785bf64
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
2015-09-22 07:17:26 -07:00
44f47903a8
Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverage
...
Added tests for Write
2015-09-22 14:28:14 +02:00
3efe5ff22e
Added tests for StdWriter.Write.
...
The tests added cover the case when the Writer field returns and error
and, related to that, when the number of written bytes is less than 0.
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-09-22 09:05:22 +02:00
a7e23cab8d
Merge pull request #15864 from dmcgowan/notary-offline
...
Support content trust offline
2015-09-21 21:11:36 -07:00
f97e6f2a37
Merge pull request #16419 from HuKeping/comments
...
Comment: add description for some code which hard to understand
2015-09-21 20:44:54 -07:00
eff524e19c
Touch up 'docker logs' documentation.
...
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-21 19:47:33 -07:00
3b443abec2
Comment: add description for some code which hard to understand
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-22 09:34:49 +08:00
108891069f
Merge pull request #16400 from albers/completion-log-opt-tags
...
bash completion: use generic `tag` log driver option
2015-09-21 17:17:11 -07:00
5c73f14c62
Merge pull request #16457 from Microsoft/10662-blockarg
...
Windows: Nice error on ARG (builder)
2015-09-21 19:43:48 -04:00
b69c13b1a6
Windows: Nice error on ARG (builder)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-21 14:54:15 -07:00
985b7ec895
Merge pull request #16465 from albers/reference-capability-all
...
reference: capability `all` should be `ALL`
2015-09-21 16:49:17 -04:00
a8eba11fb1
Merge pull request #16461 from tomdee/libnetwork-routes-fixes
...
Vendoring libnetwork
2015-09-21 16:48:16 -04:00
da82b5fedb
Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory
...
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
2015-09-21 16:34:34 -04:00
0c71c19239
Merge pull request #16404 from duglin/FixRenameError
...
Fix 'rename' error msg and error checking
2015-09-21 15:51:02 -04:00
732676fad5
Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimit
...
Add the TestRunSwapMoreThanMemoryLimit case.
2015-09-21 15:43:20 -04:00
7b4f73ee6c
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 21:40:46 +02:00
2daa5b1735
Merge pull request #16432 from calavera/volume_store
...
Move volume ref counting store to a package.
2015-09-21 15:38:06 -04:00
d37674b44b
reference: capability `all` should be `ALL`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-21 21:09:50 +02:00
d572bab4a0
Merge pull request #16437 from runcom/invalid-logger-address
...
daemon: logger: error out on daemon start if invalid logger address
2015-09-21 14:53:47 -04:00
40edb5f97c
Merge pull request #15029 from azurezk/add-version-info
...
Add docker version info in /info request
2015-09-21 11:44:11 -07:00
0fea04d27e
Organize server pre-func logic in middlewares.
...
It defines global middlewares for every request.
This makes the server slightly more composable.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-21 14:27:06 -04:00
499ade0116
Vendoring libnetwork
...
Pull in version e5fea92a6c8a5968bdb8005bf959c6e23113b689
Fixes libnetwork regressions that stopped drivers that set routes from working.
Pulls in libnetwork PRs #546 #543
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2015-09-21 11:13:14 -07:00
f018c0430b
Merge pull request #16449 from runcom/add-container-label-userguide
...
docs: userguide: add container labels section
2015-09-21 10:26:20 -07:00
72bb56618b
Move volume ref counting store to a package.
...
- Add unit tests to make sure the functionality is correct.
- Add FilterByDriver to allow filtering volumes by driver, for future
`volume ls` filtering and whatnot.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-21 12:46:49 -04:00
587558f617
Merge pull request #16440 from runcom/tempdir-check-errs
...
integration-cli: check err on tmp dir creation
2015-09-21 08:06:08 -07:00
Jess Frazelle
Tobias Gesellchen
Tibor Vass
Arnaud Porterie
moxiegirl
Carol Fager-Higgins
Jessica Frazelle
Matthias Rampke
unclejack
Brian Goff
David Calavera
Phil Estes
Harald Albers
John Howard
Antonio Murdaca
Federico Gimenez
Alexandre Beslic
Charles Chan
Hu Keping
Evan Hazlett
Antonio Murdaca
Tom Denham