toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,628 Commits 3 Branches 295 Tags
b8616b16f48941f412eed2d5bc2f510fd960addf
Commit Graph
18628 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jess Frazelle 9e47501dca Merge pull request #16525 from icecrime/fix_integration_cli 
Fix integration cli
Upstream-commit: 8f8cc077d35fc053c394f420955297bb36cfa3e0
Component: engine
 2015-09-23 13:52:28 -07:00
Jess Frazelle 97e65cfb4f Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot 
Do not try to guess "docker" in Debian SysV init script
Upstream-commit: ce092ed08e9fb762d76501e9b99c132142bdaf6b
Component: engine
 2015-09-23 13:46:19 -07:00
Arnaud Porterie 90fabf5056 Skip TestAppArmorDeniesChmodProc 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 04e1015aa06785210dc6a3e4d4ad66700a8d51b0
Component: engine
 2015-09-23 13:23:15 -07:00
Arnaud Porterie 64940b5f4a Skip TestRunUnshareProc 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 03dce24137c82caa04c215d983eac06a3edc084c
Component: engine
 2015-09-23 13:23:08 -07:00
moxiegirl 239fd6e7ef Merge pull request #16503 from carolfh/image-mag 
Image mag
Upstream-commit: ec4b71b64a1307916ec9a0d17460077798390470
Component: engine
 2015-09-23 12:43:20 -07:00
Tibor Vass f079e61160 Merge pull request #16493 from cpuguy83/doc_plugin_rpcgen 
Add README for pluginrpc-gen
Upstream-commit: 8f7f0f8deb95804eef95b572c53721ea1d0199d9
Component: engine
 2015-09-23 15:36:05 -04:00
Carol Fager-Higgins e2a6738cd5 fixed jira DTR-1173 typo in link and additional edits 
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
 2015-09-23 12:33:45 -07:00
Jess Frazelle e4f6d7ad34 Merge pull request #16522 from jfrazelle/zypper-wtaf 
fix zypper wrt interactive
Upstream-commit: 70016198ce84e545bd155627d179a8d65b7fb7f6
Component: engine
 2015-09-23 10:30:58 -07:00
Srini Brahmaroutu 71a51a6ff7 Adding error codes to image package 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: da0ca83377db0228db82b7be4096b34e3ebfb114
Component: engine
 2015-09-23 17:03:37 +00:00
Doug Davis 5ee0f81315 Move more 'daemon' errors to the new error package 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0a734182eb09497806a9ff3e1c8031ab1ab39f13
Component: engine
 2015-09-23 09:51:45 -07:00
David Calavera d75894fcf6 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>
Upstream-commit: b1d2f52bb2bb900cddb526320b13da18634fe518
Component: engine
 2015-09-23 12:07:24 -04:00
Morgan Bauer 65ae094a39 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>
Upstream-commit: 8aef1a33eb730a7c9b7e92b688bc63e6a3c69f62
Component: engine
 2015-09-23 08:55:21 -07:00
Sergey Evstifeev 7bd0a812b0 Add StdCopy happy path test: both reading and writing 
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
Upstream-commit: 6335c90d4a0536bf625ec6e77b4a0040f877d133
Component: engine
 2015-09-23 17:27:32 +02:00
Jessica Frazelle 95826bd037 fix zypper BS wrt interactive 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d265f93f6e9f6232b957592bba9a25fbc426a8c9
Component: engine
 2015-09-23 04:48:06 -07:00
Matthias Rampke 871fe73c24 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>
Upstream-commit: 01c5cfcc5629e1d90a50a8447f9712fa6ff49f48
Component: engine
 2015-09-23 11:27:34 +00:00
unclejack 029099778a Dockerfile: bump Go to 1.4.3 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 34e41580f9d91aa529ae41021a10450cf749863b
Component: engine
 2015-09-23 12:34:00 +03:00
Lei Jitang 55f78714ca Clean up: show usage when global --help present 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 4d55877e278ea62b98927c6b9fb23b4b935431c1
Component: engine
 2015-09-23 05:17:03 -04:00
Hu Keping 75633de557 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>
Upstream-commit: 141e91c4803124bdf55dd45a06998748b0ef5fb2
Component: engine
 2015-09-23 14:35:13 +08:00
qhuang 4f3fe3187a Add support for memory reservation 
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: aa1780997f42a3fbe3a7f9c7be2b8a5092b9b7c1
Component: engine
 2015-09-23 14:02:45 +08:00
John Howard d676c93895 Windows: [TP4] Add CPU Weight 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a5879bb83b8e2855e23b5a1e282940362fc35dba
Component: engine
 2015-09-22 18:29:15 -07:00
Brian Goff b761cfeb67 Add README for pluginrpc-gen 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7acd3ca79d2b13500ca3f53a567cb87fddd4a543
Component: engine
 2015-09-22 19:34:44 -04:00
David Calavera 26c6a8d526 Merge pull request #16328 from jfrazelle/opensuse-rpms 
add opensuse to rpm builder
Upstream-commit: b0dc11127ef4fc20261ccc0db03a16b17f7f91c4
Component: engine
 2015-09-22 15:59:49 -07:00
David Calavera ef74ac9a73 Merge pull request #16492 from albers/completion-compopt-mac 
[Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS
Upstream-commit: 14e8949dcfdd2c553eb6c1f7ad0ee6e13bbda50d
Component: engine
 2015-09-22 15:58:56 -07:00
Phil Estes 6f56efa779 Merge pull request #16331 from calavera/server_middlewares 
Organize server pre-func logic in middlewares.
Upstream-commit: 9dc0973655bba2250b906bc8b316d87af809a15e
Component: engine
 2015-09-22 16:10:42 -05:00
David Calavera 030ce4b62a Do not hardcode http as plugin URL scheme for secure connections. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: dc1761329768d337d7930059b334d45d016ebfd2
Component: engine
 2015-09-22 15:54:29 -04:00
Brian Goff aee0028193 Merge pull request #16312 from Microsoft/10662-startwindowscli 
Windows: First part of CI tests (docker run)
Upstream-commit: 04d76d898addae4451db28999a230a0399f08b30
Component: engine
 2015-09-22 15:37:33 -04:00
Harald Albers 7e4c20cd08 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>
Upstream-commit: 9d8f9943e99b87aa637921bbf582a767cbab6cf1
Component: engine
 2015-09-22 12:17:30 -07:00
David Calavera fca7da0a8e Merge pull request #16235 from HuKeping/oom-event 
Events for OOM needs to be shift to an earlier time
Upstream-commit: 114612305c798735e7022274cc9db382f30aa174
Component: engine
 2015-09-22 11:50:30 -07:00
John Howard 5a36e78a10 Windows: First part of CI tests (docker run) 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8a5ab83df8c029723d92a8b3a602b0d799753807
Component: engine
 2015-09-22 10:24:03 -07:00
moxiegirl cca18b2305 Merge pull request #16428 from charleswhchan/fix-logs-doc 
Touch up 'docker logs' documentation.
Upstream-commit: bfc785bf6409419cbedde4af3057ab921a5e17d8
Component: engine
 2015-09-22 07:17:26 -07:00
Hu Keping a5107b7eb0 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>
Upstream-commit: 6353f3a7b58fe7ef1cb33660003c1d7205f2e6c0
Component: engine
 2015-09-22 21:27:20 +08:00
Antonio Murdaca dc3a94b8fc Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverage 
Added tests for Write
Upstream-commit: 44f47903a831e8031edb30fef2a9c6078234ee67
Component: engine
 2015-09-22 14:28:14 +02:00
Federico Gimenez e0aff7f6e3 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>
Upstream-commit: 3efe5ff22e7bf3264f653c7f7772c64771210afe
Component: engine
 2015-09-22 09:05:22 +02:00
David Calavera f5dba44987 Merge pull request #15864 from dmcgowan/notary-offline 
Support content trust offline
Upstream-commit: a7e23cab8d10003914e39f1c954278c7be6bd759
Component: engine
 2015-09-21 21:11:36 -07:00
Alexandre Beslic a91e1506bf Merge pull request #16419 from HuKeping/comments 
Comment: add description for some code which hard to understand
Upstream-commit: f97e6f2a374b85c5ef14b19b805991d98a7f3d27
Component: engine
 2015-09-21 20:44:54 -07:00
Charles Chan 3ddae4e8f1 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>
Upstream-commit: eff524e19cb2cb6fcd6630e0aff7979e3507768c
Component: engine
 2015-09-21 19:47:33 -07:00
Hu Keping fc5d97018d Comment: add description for some code which hard to understand 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 3b443abec254cb8214881e11af4c09e923cd2dd1
Component: engine
 2015-09-22 09:34:49 +08:00
David Calavera dbbb1621a8 Merge pull request #16400 from albers/completion-log-opt-tags 
bash completion: use generic `tag` log driver option
Upstream-commit: 108891069f60a535ca6397b388145bd188dc8263
Component: engine
 2015-09-21 17:17:11 -07:00
Brian Goff 511d6df253 Merge pull request #16457 from Microsoft/10662-blockarg 
Windows: Nice error on ARG (builder)
Upstream-commit: 5c73f14c62127d136cfeec21a7f0f1c84dbf1f2c
Component: engine
 2015-09-21 19:43:48 -04:00
John Howard 295c5cdefd Windows: Nice error on ARG (builder) 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b69c13b1a643911a541c251b22b4a440197e5f7d
Component: engine
 2015-09-21 14:54:15 -07:00
Tibor Vass 36e8a28c25 Merge pull request #16465 from albers/reference-capability-all 
reference: capability `all` should be `ALL`
Upstream-commit: 985b7ec895e75337056e8db1d7fa28e15c0b8180
Component: engine
 2015-09-21 16:49:17 -04:00
Tibor Vass 74eb321129 Merge pull request #16461 from tomdee/libnetwork-routes-fixes 
Vendoring libnetwork
Upstream-commit: a8eba11fb111276e7e8917b701de2361aad07eb2
Component: engine
 2015-09-21 16:48:16 -04:00
Tibor Vass d787275160 Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory 
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
Upstream-commit: da82b5fedbc4763424e305d330cf7c31f896fed3
Component: engine
 2015-09-21 16:34:34 -04:00
Evan Hazlett f1430df5ab Merge pull request #16404 from duglin/FixRenameError 
Fix 'rename' error msg and error checking
Upstream-commit: 0c71c192395e259d76a51e08c7c3bd73eb6f16e7
Component: engine
 2015-09-21 15:51:02 -04:00
Evan Hazlett 1598efd7a1 Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimit 
Add the TestRunSwapMoreThanMemoryLimit case.
Upstream-commit: 732676fad53bec21b332d1430d102502c4c4e737
Component: engine
 2015-09-21 15:43:20 -04:00
Antonio Murdaca fd7f03427f daemon: execdriver: lxc: fix wrong template value passed to lxc conf 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 7b4f73ee6c2a06532124e77ec5f4972f078a7d5c
Component: engine
 2015-09-21 21:40:46 +02:00
Tibor Vass 78209a9e2f Merge pull request #16432 from calavera/volume_store 
Move volume ref counting store to a package.
Upstream-commit: 2daa5b17353ad0700013641cf7dfc091cbd02c6e
Component: engine
 2015-09-21 15:38:06 -04:00
Harald Albers 022c1e60a2 reference: capability all should be ALL 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d37674b44b4b843dcdd2626b58645d9ffef2cb6e
Component: engine
 2015-09-21 21:09:50 +02:00
Tibor Vass 7a04c92cc8 Merge pull request #16437 from runcom/invalid-logger-address 
daemon: logger: error out on daemon start if invalid logger address
Upstream-commit: d572bab4a09eb7d60961867d2d2f9896595a3271
Component: engine
 2015-09-21 14:53:47 -04:00
Alexandre Beslic a3f8f51f2a Merge pull request #15029 from azurezk/add-version-info 
Add docker version info in /info request
Upstream-commit: 40edb5f97c3ba95e450c8280b29d0ef027b51cfb
Component: engine
 2015-09-21 11:44:11 -07:00