summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-bootJess Frazelle2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Do not try to guess "docker" in Debian SysV init script
| * | | | | | | | | | Do not try to guess "docker" in Debian SysV init scriptMatthias Rampke2015-09-231-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge pull request #16503 from carolfh/image-magmoxiegirl2015-09-231-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Image mag
| * | | | | | | | | | fixed jira DTR-1173 typo in link and additional editsCarol Fager-Higgins2015-09-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
* | | | | | | | | | | Merge pull request #16493 from cpuguy83/doc_plugin_rpcgenTibor Vass2015-09-232-1/+69
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Add README for pluginrpc-gen
| * | | | | | | | | | Add README for pluginrpc-genBrian Goff2015-09-222-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | | | | | | | Merge pull request #16522 from jfrazelle/zypper-wtafJess Frazelle2015-09-232-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | fix zypper wrt interactive
| * | | | | | | | | | fix zypper BS wrt interactiveJessica Frazelle2015-09-232-4/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jessica Frazelle <acidburn@docker.com>
* | | | | | | | | | Merge pull request #16328 from jfrazelle/opensuse-rpmsDavid Calavera2015-09-225-7/+45
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | add opensuse to rpm builder
| * | | | | | | | | | add opensuse to rpm builderJessica Frazelle2015-09-155-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jessica Frazelle <acidburn@docker.com>
* | | | | | | | | | | Merge pull request #16492 from albers/completion-compopt-macDavid Calavera2015-09-221-16/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | [Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS
| * | | | | | | | | | Bash completion: avoid 'compopt: command not found' errors on Mac OSHarald Albers2015-09-221-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | Merge pull request #16331 from calavera/server_middlewaresPhil Estes2015-09-225-59/+274
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Organize server pre-func logic in middlewares.
| * | | | | | | | | | Organize server pre-func logic in middlewares.David Calavera2015-09-215-59/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines global middlewares for every request. This makes the server slightly more composable. Signed-off-by: David Calavera <david.calavera@gmail.com>
* | | | | | | | | | | Merge pull request #16312 from Microsoft/10662-startwindowscliBrian Goff2015-09-226-107/+381
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Windows: First part of CI tests (docker run)
| * | | | | | | | | | | Windows: First part of CI tests (docker run)John Howard2015-09-226-107/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | | | | | | | | | Merge pull request #16235 from HuKeping/oom-eventDavid Calavera2015-09-2211-21/+141
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Events for OOM needs to be shift to an earlier time
| * | | | | | | | | | | Events for OOM needs to be shift to an earlier timeHu Keping2015-09-2111-21/+141
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's worth to warn user as soon as possilbe when OOM happend. Signed-off-by: Hu Keping <hukeping@huawei.com>
* | | | | | | | | | | Merge pull request #16428 from charleswhchan/fix-logs-docmoxiegirl2015-09-221-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Touch up 'docker logs' documentation.
| * | | | | | | | | | | Touch up 'docker logs' documentation.Charles Chan2015-09-211-4/+4
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | | | | | | | | | Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverageAntonio Murdaca2015-09-221-0/+36
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Added tests for Write
| * | | | | | | | | | Added tests for StdWriter.Write.Federico Gimenez2015-09-221-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | Merge pull request #15864 from dmcgowan/notary-offlineDavid Calavera2015-09-213-7/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support content trust offline
| * | | | | | | | | | | Ignore ping errors in notary repository setupDerek McGowan2015-09-143-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notary is capable of acting in offline mode, making use of cache TUF data. When ping is not successful, notary should still be attempted without error. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
* | | | | | | | | | | | Merge pull request #16419 from HuKeping/commentsAlexandre Beslic2015-09-212-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Comment: add description for some code which hard to understand
| * | | | | | | | | | | | Comment: add description for some code which hard to understandHu Keping2015-09-222-1/+8
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hu Keping <hukeping@huawei.com>
* | | | | | | | | | | | Merge pull request #16400 from albers/completion-log-opt-tagsDavid Calavera2015-09-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | bash completion: use generic `tag` log driver option
| * | | | | | | | | | | | bash completion: use generic `tag` log driver optionHarald Albers2015-09-181-3/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de>
* | | | | | | | | | | | Merge pull request #16457 from Microsoft/10662-blockargBrian Goff2015-09-213-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: Nice error on ARG (builder)
| * | | | | | | | | | | | Windows: Nice error on ARG (builder)John Howard2015-09-213-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | | | | | | | | | | Merge pull request #16465 from albers/reference-capability-allTibor Vass2015-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference: capability `all` should be `ALL`
| * | | | | | | | | | | | | reference: capability `all` should be `ALL`Harald Albers2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de>
* | | | | | | | | | | | | | Merge pull request #16461 from tomdee/libnetwork-routes-fixesTibor Vass2015-09-219-26/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendoring libnetwork
| * | | | | | | | | | | | | | Vendoring libnetworkTom Denham2015-09-219-26/+52
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | | | Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemoryTibor Vass2015-09-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: execdriver: lxc: fix wrong template value passed to lxc conf
| * | | | | | | | | | | | | | daemon: execdriver: lxc: fix wrong template value passed to lxc confAntonio Murdaca2015-09-211-2/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antonio Murdaca <runcom@linux.com>
* | | | | | | | | | | | | | Merge pull request #16404 from duglin/FixRenameErrorEvan Hazlett2015-09-213-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'rename' error msg and error checking
| * | | | | | | | | | | | | | Fix 'rename' error msg and error checkingDoug Davis2015-09-183-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `docker rename foo ''` would result in: ``` usage: docker rename OLD_NAME NEW_NAME ``` which is the old engine's way of return errors - yes that's in the daemon code. So I fixed that error msg to just be normal. While doing that I noticed that using an empty string for the source container name failed but didn't print any error message at all. This is because we would generate a URL like: ../containers//rename/.. which would cause a 301 redirect to ../containers/rename/.. however the CLI code doesn't actually deal with 301's - it just ignores them and returns back to the CLI code/caller. Rather than changing the CLI to deal with 3xx error codes, which would probably be a good thing to do in a follow-on PR, for this immediate issue I just added a cli-side check for empty strings for both old and new names. This way we catch it even before we hit the daemon. API callers will get a 404, assuming they follow the 301, for the case of the src being empty, and the new error msg when the destination is empty - so we should be good now. Add tests for both cases too. Signed-off-by: Doug Davis <dug@us.ibm.com>
* | | | | | | | | | | | | | | Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimitEvan Hazlett2015-09-211-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the TestRunSwapMoreThanMemoryLimit case.
| * | | | | | | | | | | | | | | Add the TestRunSwapLessThanMemoryLimit case.Yuan Sun2015-09-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
* | | | | | | | | | | | | | | | Merge pull request #16432 from calavera/volume_storeTibor Vass2015-09-2111-182/+456
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move volume ref counting store to a package.
| * | | | | | | | | | | | | | | | Move volume ref counting store to a package.David Calavera2015-09-2111-182/+456
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | | | | | | | | | | Merge pull request #16437 from runcom/invalid-logger-addressTibor Vass2015-09-214-61/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | daemon: logger: error out on daemon start if invalid logger address
| * | | | | | | | | | | | | | | api: server: container: fix wrong commentAntonio Murdaca2015-09-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment was wrongly referring to the old job mechanism and it wasn't clear what it was trying to document. Signed-off-by: Antonio Murdaca <runcom@linux.com>
| * | | | | | | | | | | | | | | daemon: logger: error out on daemon start if invalid logger addressAntonio Murdaca2015-09-203-60/+84
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an invalid logger address is provided on daemon start it will silently fail. As syslog driver is doing, this check should be done on daemon start and prevent it from starting even in other drivers. This patch also adds integration tests for this behavior. Signed-off-by: Antonio Murdaca <runcom@linux.com>
* | | | | | | | | | | | | | | Merge pull request #15029 from azurezk/add-version-infoAlexandre Beslic2015-09-218-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Add docker version info in /info request
| * | | | | | | | | | | | | | add docker server version to /infoZhang Kun2015-09-218-1/+9
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Zhang Kun <zkazure@gmail.com>
* | | | | | | | | | | | | | Merge pull request #16449 from runcom/add-container-label-userguidemoxiegirl2015-09-211-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | docs: userguide: add container labels section
| * | | | | | | | | | | | | docs: userguide: add container labels sectionAntonio Murdaca2015-09-211-1/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antonio Murdaca <runcom@linux.com>
* | | | | | | | | | | | | Merge pull request #16440 from runcom/tempdir-check-errsAlexandre Beslic2015-09-211-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | integration-cli: check err on tmp dir creation