toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,076 Commits 3 Branches 295 Tags
1a66a2a6f752bdc7fa543564e293131d8d8c2ee2
Commit Graph
20076 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
moxiegirl 1a66a2a6f7 Merge pull request #18094 from tophj-ibm/faq-link-fix 
Fixed docker network link in faq
Upstream-commit: d395134b3df59cf9377c78255c56867f126c7674
Component: engine
 2015-11-20 12:13:07 -08:00
Vincent Demeester 4d4420c373 Merge pull request #18073 from runcom/hostconfig-resources 
runconfig: split resources into a struct
Upstream-commit: f064b9941c0c6070740339971a0bb59b4fe6195f
Component: engine
 2015-11-20 20:29:44 +01:00
David Calavera 9479751884 Merge pull request #17718 from wenchma/17716_before_filter_doc 
Re-implement --before and --since as options for --filter
Upstream-commit: 8fa09749fb7b5560ffc7f0a73005302f99d89d01
Component: engine
 2015-11-20 11:24:19 -08:00
Michael Crosby bbfff7fedd Merge pull request #18067 from cpuguy83/fix_pull_space_test 
Make TestDaemonNoSpaceleftOnDeviceError linux only
Upstream-commit: 6e49343202d77ef103eb2b4e33658b8bb18d7716
Component: engine
 2015-11-20 10:51:21 -08:00
Alexander Morozov 1a93f456bb Merge pull request #18126 from tiborvass/merge_release_v1.9.1 
Merge release v1.9.1
Upstream-commit: 6980113d104725f42f69c2ce4ce1be40b6d5bf65
Component: engine
 2015-11-20 10:45:59 -08:00
Tibor Vass 81780d8309 Bump version back to 1.10.0-dev 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 75cb2dfe911c39a084b78a5b0d79d11b0792dbed
Component: engine
 2015-11-20 13:40:25 -05:00
Antonio Murdaca 012bc4d1d4 runconfig: split resources into a struct 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1a0b483e02aff72c16871fb2f74644e091bda93c
Component: engine
 2015-11-20 19:40:01 +01:00
Tibor Vass ee83ee5115 Bump version to v1.9.1 
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	VERSION
Upstream-commit: fefbb507a9c78f947e333b2e5eaf5923fc8709a8
Component: engine
 2015-11-20 13:38:15 -05:00
Jess Frazelle 4abbb3cdf7 Merge pull request #18109 from phemmer/yum-docs-fix 
remove unnecessary echo from yum docs
Upstream-commit: c1f11f81441fffc556ec0a45cb299d16ffe04947
Component: engine
 2015-11-20 13:10:55 -05:00
Alexander Morozov 6d12941a33 Merge pull request #16168 from NIWAHideyuki/16164-shm-size 
Addition of "--shm-size" to which size of /dev/shm is changed
Upstream-commit: a76bdea21ba204b1cdc6648a182ae82355350a5f
Component: engine
 2015-11-20 10:01:48 -08:00
Brian Goff 7dc1436aeb Make TestDaemonNoSpaceleftOnDeviceError linux only 
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 44d3f2f71a9a522597655b7c8733422fe70c39a0
Component: engine
 2015-11-20 12:44:49 -05:00
Vincent Demeester 00f170cb07 Merge pull request #18115 from wenchma/16756-docker_api_exec_test 
Use checker Assert for integration-cli/docker_api_exec_test.go
Upstream-commit: f9a4751eebaf1bce78be55dc2fa66d8fc45211d3
Component: engine
 2015-11-20 18:14:21 +01:00
Tibor Vass 4599b4fbfc Merge pull request #17456 from Microsoft/TestChtimesFix 
Fix ChTimes to prevent setting times past the Unix Max Time
Upstream-commit: 6e727a4c8037d3ea43913ee23f34c9babaf420eb
Component: engine
 2015-11-20 18:07:09 +01:00
Wen Cheng Ma 8bb950a677 Use checker Assert for integration-cli/docker_api_exec_test.go 
Partially fix issue #16756

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 1814a1dac54eba86616a73b9430788a8c587d4cb
Component: engine
 2015-11-20 23:34:52 +08:00
Sebastiaan van Stijn f0ecd6735e Merge pull request #18101 from IanLee1521/patch-1 
Fix minor grammar mistake.
Upstream-commit: 7a1b05ccce18cbec4742c0a766f3424f817837df
Component: engine
 2015-11-20 11:43:42 +01:00
Sebastiaan van Stijn 4cd1a52462 Merge pull request #18026 from woodvi/doc-network-tutorial 
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
 2015-11-20 10:46:00 +01:00
Sebastiaan van Stijn fb0212db59 Merge pull request #17861 from gissehel/apt-source-doc 
explicit way to express that docker.list are different choices and not just one big file
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
 2015-11-20 10:06:13 +01:00
Sebastiaan van Stijn 295eff51a3 Merge pull request #18079 from moxiegirl/fix-bad-markdown 
Small Markdown Fixes to storage driver/commands ref
Upstream-commit: 3dac1fb18915f3aee1fcdeeb0688340fe6809143
Component: engine
 2015-11-20 09:22:04 +01:00
Wen Cheng Ma 9380772bfb Re-implement --before and --since as options for --filter 
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 1921c629381d25ebff7b8b8c8348a0a81525f264
Component: engine
 2015-11-20 13:10:13 +08:00
Patrick Hemmer 1b8755d994 remove unnecessary echo from yum docs 
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: 3cbccccb37f6f50ebb49e9738af09a0d7d79549a
Component: engine
 2015-11-19 20:51:43 -05:00
Mary Anthony 7c1d3da9d9 Small changes to storage driver/commands ref 
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
 2015-11-19 17:13:23 -08:00
Michael Crosby 5832a3ebde Merge pull request #17005 from mavenugo/restart 
Adding a restart test to make sure #16887 doesnt happens again
Upstream-commit: ee03a05595e6ecd373553d33a01aff4d18bcc63c
Component: engine
 2015-11-19 17:01:34 -08:00
NIWA Hideyuki 4581692a0e Addition of "--shm-size" to which size of /dev/shm is changed. 
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: 5aeaf2a0c4236711e0981515d8627b30e22a1637
Component: engine
 2015-11-20 09:24:18 +09:00
Michael Crosby e1191bf537 Merge pull request #17459 from brahmaroutu/Power_Z_CI 
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
 2015-11-19 15:50:07 -08:00
Alexander Morozov 1d43e38301 Merge pull request #18082 from MHBauer/gh9406 
Remove defaults for flags/options that expect no value
Upstream-commit: 9c21e852b2674a68d9b0fbbada368f5b7818b494
Component: engine
 2015-11-19 15:06:21 -08:00
Alexander Morozov 0d167eb54d Merge pull request #18103 from crosbymichael/image-link 
Remove alt from markdown image
Upstream-commit: 0d98e2470fd985f3c113f44a93084d87e1a167f9
Component: engine
 2015-11-19 14:09:43 -08:00
Michael Crosby e5f9171396 Remove alt from markdown image 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 38a58a4a1c92e6efa4bcf2a809883cef8c391f05
Component: engine
 2015-11-19 14:06:16 -08:00
Michael Crosby c99e76c95d Merge pull request #18102 from mavenugo/sb_ep_race 
Fixed an endpoint delete issue with a possible stale sbox
Upstream-commit: da969aac5ab0b1376615ed54fb54a909c98f05f8
Component: engine
 2015-11-19 13:55:28 -08:00
Alexander Morozov 3221274c6e Merge pull request #18084 from wenchma/18054_exec_start_fix 
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
 2015-11-19 13:51:46 -08:00
Alexander Morozov 27b2c588e8 Merge pull request #18076 from rhvgoyal/unmount-recursive 
Unmount recursively to unmount volumes
Upstream-commit: 24fb3659dfe1b4f4dfa4592699fb53d0868a95fe
Component: engine
 2015-11-19 13:46:48 -08:00
Alexander Morozov fd8d0f506e Merge pull request #17908 from calavera/carry_17059 
[Carry 17059] allow filtering containers by any status
Upstream-commit: 37f64ded44249fb174ba1797d6f6183575375300
Component: engine
 2015-11-19 13:24:43 -08:00
Vincent Demeester 60990134ed Merge pull request #18096 from Microsoft/jjh/dockerinfoav 
Windows: [TP4] docker info crashes
Upstream-commit: b205b06d3e4ec4d1850f1a2d7eebb43f13e9ef46
Component: engine
 2015-11-19 21:48:02 +01:00
Madhu Venugopal cc6e53230d Fixed an endpoint delete issue with a possible stale sbox 
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea
Component: engine
 2015-11-19 12:46:37 -08:00
Vivek Goyal 712fdcff89 Use lazy unmount to unmount volumes 
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: b9e701b203ff49966aac00e058feb5d46bbb97f0
Component: engine
 2015-11-19 20:46:07 +00:00
Ian Lee 61aac55c3c Fix minor grammar mistake. 
Signed-off-by: Ian Lee <IanLee1521@gmail.com>
Upstream-commit: ad7696a78775df7cc671113b29fb34ca66b3ace5
Component: engine
 2015-11-19 12:24:25 -08:00
David Calavera 9c09b9b37a Test that paused containers show up filtering by status. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 2a07b19fd8fd402b4ec7b7814f85d099c8b8efca
Component: engine
 2015-11-19 14:32:25 -05:00
Kamil Domański 1d7fc30a8e allow filtering containers by any status 
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
Upstream-commit: f30364c5835452598e58781f360681f2d77fa16c
Component: engine
 2015-11-19 14:11:41 -05:00
Darren Stahl 5fc4e385a6 This fixes Chtimes on systems with 32 bit Timespec 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 318ad1cb43bcf01f03d790ae258506121f30f117
Component: engine
 2015-11-19 11:08:29 -08:00
John Howard 9f741a440b Windows: [TP4] docker info crashes 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 37d2a7003864f8bdb5d8f6e3d9dcb4367fc94a6a
Component: engine
 2015-11-19 11:02:25 -08:00
David Calavera c97969e0fa Merge pull request #18090 from vdemeester/17478-follow-up-cleanup-pkg-platform 
Follow-up of 17478, unexport runtimeArchitecture method
Upstream-commit: aade9536b6b64f6db385f38078b20bff846aec54
Component: engine
 2015-11-19 14:00:23 -05:00
Antonio Murdaca ab09680165 Merge pull request #18083 from Mashimiao/opt-weightdevice-fix-typo 
opts/weightdevice: fix typo
Upstream-commit: 758fae5f6b079b0125a657854e7e853d638dc569
Component: engine
 2015-11-19 19:44:18 +01:00
Antonio Murdaca 9915694041 Merge pull request #18064 from hypriot/17478-fix-for-arm 
Change casting of utsname.Machine to fix make binary for ARM
Upstream-commit: 43cf875633b63983bbbb7829102183242404eef7
Component: engine
 2015-11-19 19:42:20 +01:00
Stefan Scherer 135336d608 Move charsToString to architecture dependent source to fix casting problem 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 7c1d49d90cbd91d7cc06d92686e2d09dd3dcac27
Component: engine
 2015-11-19 18:09:08 +01:00
Christopher Jones eaf8c7856d Fixed docker network link in faq 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 1f0dc72d4abd1ddc7e348934c6a1bc59f6937678
Component: engine
 2015-11-19 11:08:04 -06:00
Morgan Bauer f51688acff Remove defaults for flags/options that expect no value 
- isZeroValue function from upstream go
 - covers booleans, strings and numbers
 - change integration to reflect new behavior
 - resolves #9406

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 48718a3c772681b4a3644ba304d37fb9382e6f73
Component: engine
 2015-11-19 08:37:51 -08:00
Wen Cheng Ma 7d68517eab Update docs and test of exec create api return codes 
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 01b86d612cba22602509b436aad36d41135f14ce
Component: engine
 2015-11-19 22:22:27 +08:00
Vincent Demeester 521256e49f Follow-up of 17478, unexport private method 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0ff3c10aa8328c1f574ae6dd8caf5e20c3b97dfa
Component: engine
 2015-11-19 14:55:57 +01:00
Vincent Demeester 12f51add56 Merge pull request #17704 from LK4D4/default_cgroupfs 
Use fs cgroups by default
Upstream-commit: c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610
Component: engine
 2015-11-19 14:01:13 +01:00
Ma Shimiao f0648cade3 opts/weightdevice: fix typo 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 8d4c0ba27489b51bfce01bc37fa3fe88612bd390
Component: engine
 2015-11-19 17:03:46 +08:00
Madhu Venugopal 39092c8452 Adding a restart test to make sure #16887 doesnt happens again 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: be9b7a2459fef01e0f5cd3a8d1ad2dc822a5b1dd
Component: engine
 2015-11-18 23:29:25 -08:00