Jess Frazelle
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
Arnaud Porterie
04e1015aa0
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:15 -07:00
Arnaud Porterie
03dce24137
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-23 13:23:08 -07:00
moxiegirl
ec4b71b64a
Merge pull request #16503 from carolfh/image-mag
...
Image mag
2015-09-23 12:43:20 -07:00
Tibor Vass
8f7f0f8deb
Merge pull request #16493 from cpuguy83/doc_plugin_rpcgen
...
Add README for pluginrpc-gen
2015-09-23 15:36:05 -04:00
Carol Fager-Higgins
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
Jess Frazelle
70016198ce
Merge pull request #16522 from jfrazelle/zypper-wtaf
...
fix zypper wrt interactive
2015-09-23 10:30:58 -07:00
Srini Brahmaroutu
da0ca83377
Adding error codes to image package
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-23 17:03:37 +00:00
Doug Davis
0a734182eb
Move more 'daemon' errors to the new error package
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-23 09:51:45 -07:00
David Calavera
b1d2f52bb2
Improvements to the original sharing implementation.
...
- Print the mount table as in /proc/self/mountinfo
- Do not exit prematurely when one of the ipc mounts doesn't exist.
- Do not exit prematurely when one of the ipc mounts cannot be unmounted.
- Add a unit test to see if the cleanup really works.
- Use syscall.MNT_DETACH to cleanup mounts after a crash.
- Unmount IPC mounts when the daemon unregisters an old running container.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-23 12:07:24 -04:00
Morgan Bauer
8aef1a33eb
refactor attach to not use internal data structures
...
- refactor to make it easier to split the api in the future
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-23 08:55:21 -07:00
Sergey Evstifeev
6335c90d4a
Add StdCopy happy path test: both reading and writing
...
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
2015-09-23 17:27:32 +02:00
Jessica Frazelle
d265f93f6e
fix zypper BS wrt interactive
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-23 04:48:06 -07:00
Matthias Rampke
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
unclejack
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
Lei Jitang
4d55877e27
Clean up: show usage when global --help present
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-23 05:17:03 -04:00
Hu Keping
141e91c480
Format output of docker info
...
Format those info which will only be displayed when daemon is
in debug mode.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-23 14:35:13 +08:00
qhuang
aa1780997f
Add support for memory reservation
...
Signed-off-by: qhuang <qhuang@10.0.2.15>
2015-09-23 14:02:45 +08:00
John Howard
a5879bb83b
Windows: [TP4] Add CPU Weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-22 18:29:15 -07:00
Brian Goff
7acd3ca79d
Add README for pluginrpc-gen
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-22 19:34:44 -04:00
David Calavera
b0dc11127e
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
2015-09-22 15:59:49 -07:00
David Calavera
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
Phil Estes
9dc0973655
Merge pull request #16331 from calavera/server_middlewares
...
Organize server pre-func logic in middlewares.
2015-09-22 16:10:42 -05:00
David Calavera
dc17613297
Do not hardcode http as plugin URL scheme for secure connections.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-22 15:54:29 -04:00
Brian Goff
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
Harald Albers
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
David Calavera
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
John Howard
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
moxiegirl
bfc785bf64
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
2015-09-22 07:17:26 -07:00
Hu Keping
6353f3a7b5
Format the output of docker history
...
Once there have '\t' in the "CREATED BY" section, it will possibly
cause a messy output of docker history.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-22 21:27:20 +08:00
Antonio Murdaca
44f47903a8
Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverage
...
Added tests for Write
2015-09-22 14:28:14 +02:00
Federico Gimenez
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
David Calavera
a7e23cab8d
Merge pull request #15864 from dmcgowan/notary-offline
...
Support content trust offline
2015-09-21 21:11:36 -07:00
Alexandre Beslic
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
Charles Chan
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
Hu Keping
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
David Calavera
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
Brian Goff
5c73f14c62
Merge pull request #16457 from Microsoft/10662-blockarg
...
Windows: Nice error on ARG (builder)
2015-09-21 19:43:48 -04:00
John Howard
b69c13b1a6
Windows: Nice error on ARG (builder)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-21 14:54:15 -07:00
Tibor Vass
985b7ec895
Merge pull request #16465 from albers/reference-capability-all
...
reference: capability `all` should be `ALL`
2015-09-21 16:49:17 -04:00
Tibor Vass
a8eba11fb1
Merge pull request #16461 from tomdee/libnetwork-routes-fixes
...
Vendoring libnetwork
2015-09-21 16:48:16 -04:00
Tibor Vass
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
Evan Hazlett
0c71c19239
Merge pull request #16404 from duglin/FixRenameError
...
Fix 'rename' error msg and error checking
2015-09-21 15:51:02 -04:00
Evan Hazlett
732676fad5
Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimit
...
Add the TestRunSwapMoreThanMemoryLimit case.
2015-09-21 15:43:20 -04:00
Antonio Murdaca
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
Tibor Vass
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
Harald Albers
d37674b44b
reference: capability `all` should be `ALL`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-21 21:09:50 +02:00
Tibor Vass
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
Alexandre Beslic
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
David Calavera
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