docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
29,109 Commits 12 Branches 297 Tags
d9813c8cd87f2b56b03a98c34d70a2f7404332a5
Commit Graph

27356 Commits

Author SHA1 Message Date
Brian Goff
d9813c8cd8 Merge pull request #28584 from justincormack/devpts-multiple-4.8 
Fix check config script on 4.8 kernels
Upstream-commit: 3e31f3744ea8f915ffb27398abac3efbdadfb8f2
Component: engine
 2016-11-18 08:18:08 -05:00
Vincent Demeester
c61cce0a3d Merge pull request #28354 from ripcurld00d/tag_creation 
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
 2016-11-18 13:02:40 +01:00
Justin Cormack
6a727694ed Fix check config script on 4.8 kernels 
DEVPTS_MULTIPLE_INSTANCES is no longer an option, it is always set, so
do not check for this post 4.8.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 228ee16df3d738efaf001309370b26561c49edd6
Component: engine
 2016-11-18 11:42:05 +00:00
Vincent Demeester
fac3c72b9c Merge pull request #28540 from lixiaobing10051267/masterNewContainerId 
expected new_container_id while testing ContainerCommit
Upstream-commit: c0acfd1dadff10b3151699558232af7b7fc67718
Component: engine
 2016-11-18 12:13:30 +01:00
Vincent Demeester
c2c8a860a9 Merge pull request #28565 from crosbymichael/cputime 
Fix cfs period calculation
Upstream-commit: 9e43a68f697832cd895cf8c512d3f7d497b3d0f5
Component: engine
 2016-11-18 12:12:53 +01:00
Michael Crosby
8e7b567a6b Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: aff99136b44c0a3d9ef381afd38a5cd05328ddc6
Component: engine
 2016-11-18 00:47:43 -08:00
Boaz Shuster
af870551d0 Change the docker-tag usage text to be clearer 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 039aca05c2eae8a06dc16ff97110539feb44d13b
Component: engine
 2016-11-18 10:34:02 +02:00
Tõnis Tiigi
57cb96469f Merge pull request #28558 from cpuguy83/add_vim 
Add vim to Dockerfile
Upstream-commit: 27699ba8b23217525b0b026fa689834db4454a35
Component: engine
 2016-11-17 21:14:19 -08:00
lixiaobing10051267
bab39b5981 expected new_container_id while testing ContainerCommit 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 773ae28daed55c8d89e753c1cb6b8b7e4102d3b6
Component: engine
 2016-11-18 10:21:04 +08:00
Brian Goff
a0ff297783 Add vim to Dockerfile 
Why? Most of the time I end up needing an editor when in `make shell`.
Spent much time doing `apt-get update && apt-get install vim`.
Since we're already installing vim-common anyway...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7d1a72a2866aedbc7492a0cfc5cd4e13646322fe
Component: engine
 2016-11-17 20:02:26 -05:00
Sebastiaan van Stijn
2b9dc0f4a1 Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference 
Update `images` cli reference with reference filter
Upstream-commit: c6d69ea9e9a913e6036c5e3832083183ce92da23
Component: engine
 2016-11-18 01:34:48 +01:00
Michael Crosby
f88393dfba Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
Upstream-commit: 4b29f404b1afe0989426d7a0cc0d2e01a7a3f2b6
Component: engine
 2016-11-17 16:29:21 -08:00
Sebastiaan van Stijn
ecfb55a706 Merge pull request #28560 from akshaykarle/master 
fix a typo
Upstream-commit: d9612db9745a6f1f0551536add119d4d2f9808c2
Component: engine
 2016-11-18 01:03:05 +01:00
Michael Crosby
ba96408498 Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable 
api/server/httputils: service unavailable for disable swarm
Upstream-commit: bbac9eeae68a2d1084961dc3b0adc4e9e729647c
Component: engine
 2016-11-17 15:16:23 -08:00
Michael Crosby
02df9fec1f Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template 
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e61ad7465503a2cfe4c8cfec2f929831c28fd84a
Component: engine
 2016-11-17 15:13:02 -08:00
Vincent Demeester
3dbc7d0417 Merge pull request #28557 from vdemeester/fix-tini-compilation-error-on-photon 
Update Tini to fix photon build-rpm compilation errors
Upstream-commit: 870f52533f6678594839a06d872a173f213b9a7c
Component: engine
 2016-11-17 23:40:39 +01:00
Vincent Demeester
88f526a8b0 Merge pull request #28552 from tomwilkie/fix-multi-read-seeker 
Fix use of cap in MultiReadSeeker; possible data corruption bug.
Upstream-commit: 423c014038714cc28926429203580ca882bcd63f
Component: engine
 2016-11-17 23:40:30 +01:00
Tõnis Tiigi
9f30feb096 Merge pull request #28554 from vieux/showhelp 
refactor help func in CLI
Upstream-commit: 43de09045c3aa7e1d2f45533cbd243a6e2d26f5e
Component: engine
 2016-11-17 14:27:26 -08:00
Akshay Karle
0a4f3b6f0e fix a typo 
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
Upstream-commit: 2d08a764211035ec93aa3a97afb2baff074103da
Component: engine
 2016-11-17 16:51:37 -05:00
Brian Goff
e3739bc965 Merge pull request #28383 from zteBill/fix-useless-var 
Remove needless var
Upstream-commit: 6969c98a3c9ca90616d88c6a57543ccd5724e6fb
Component: engine
 2016-11-17 16:18:07 -05:00
Tom Wilkie
169609485f s/bCap/bLen/ 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Upstream-commit: 3a0554585177a55802377423bb4529d305b4566f
Component: engine
 2016-11-17 21:05:09 +00:00
Vincent Demeester
182a7a908f Update Tini to fix photon build-rpm compilation errors 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ce33d4e1c3d2ca3672a4d7e8e2b553de842fef30
Component: engine
 2016-11-17 22:03:32 +01:00
Sebastiaan van Stijn
3de41949d9 Merge pull request #28551 from cpuguy83/28517_dont_spew_so_much 
Reduce spew data dumped
Upstream-commit: f297dea6575845b87957ebbeebe149cccf3a5e08
Component: engine
 2016-11-17 21:37:06 +01:00
Brian Goff
a43886ca90 Merge pull request #28538 from yongtang/11162016-Log-Logf-fix 
Fix several issues with `go vet` and `gofmt -s`
Upstream-commit: 22dccaf2d6503e141e48ae3d9f3edc7ace946bbd
Component: engine
 2016-11-17 15:21:22 -05:00
Tõnis Tiigi
216885f6b0 Merge pull request #28531 from cpuguy83/wait_stop_ctx 
Use WaitWithContext for WaitStop
Upstream-commit: b59ee9486fad5fa19f3d0af0eb6c5ce100eae0fc
Component: engine
 2016-11-17 11:52:19 -08:00
Stephen J Day
781fc7e6b4 api/server/httputils: service unavailable for disable swarm 
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.

We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 1d90d7604881e29b71819af9c092d565513aeeec
Component: engine
 2016-11-17 11:43:45 -08:00
Brian Goff
c8210e7c2f Merge pull request #28290 from KevinTHU/master 
fix "fatal error: concurrent map read and map write" bugs when we concurrently execute lots of delete volumes and create or list volumes tasks
Upstream-commit: 31a050e31b6d49481d9e3ba96c0b67b1574a0e76
Component: engine
 2016-11-17 13:59:09 -05:00
Aaron Lehmann
f2f46094c2 Merge pull request #28523 from yongtang/28519-service-inspect-pretty-crash 
Fix crash caused by `docker service inspect --pretty`
Upstream-commit: 6d0f7bb4c718cbd0ae8e80bb1e974e7632d03d75
Component: engine
 2016-11-17 10:56:57 -08:00
Victor Vieux
2e39dde1e5 refactor help func in CLI 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: bf95472105e5dad55314cfff599abea5b81b134a
Component: engine
 2016-11-17 10:54:10 -08:00
Tom Wilkie
6ad95c4c59 Fix use of cap in MultiReadSeeker 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Upstream-commit: 158bb9bbd588aa03a3567f40b367025ccbd81fb3
Component: engine
 2016-11-17 18:36:35 +00:00
Alexander Morozov
d4244fefc2 Merge pull request #28415 from Microsoft/jjh/builduser 
Windows: Allow `USER` in builder
Upstream-commit: 0a5a41a438ae4fef2fc1f8f8935721f1e3f28769
Component: engine
 2016-11-17 10:32:56 -08:00
Alexander Morozov
ffe69df229 Merge pull request #28462 from tonistiigi/health-deadlock 
Fix deadlock on cancelling healthcheck
Upstream-commit: c2fbf0871df2e2e41adc6a08e6bfd47e09e69ff9
Component: engine
 2016-11-17 10:30:57 -08:00
Alexander Morozov
1f1e59bbc9 Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists 
remove unused error ErrPendingSwarmExists
Upstream-commit: 8a6c5358af9cf4485cd2c993a9d4111deb10c81c
Component: engine
 2016-11-17 10:17:47 -08:00
Brian Goff
d6c74c3fa0 Reduce spew data dumped 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4130eb24e9e844bcfa9a336a7fef7698ad0e5c9f
Component: engine
 2016-11-17 13:10:48 -05:00
Vincent Demeester
49f71532e6 Update images cli reference with reference filter 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a0d7b34d9cb0876f8583a6e15d1b1aaab8d2b9ab
Component: engine
 2016-11-17 15:34:17 +01:00
Brian Goff
6d14b1c8dc Merge pull request #28526 from aluzzardi/master-revendor-swarmkit 
[master] Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Upstream-commit: 57f44b4598a270d9e449780a6ff2aac75d56bb6c
Component: engine
 2016-11-17 09:33:18 -05:00
Yong Tang
dcce853abc Fix several issues with go vet and go fmt 
For some reason, `go vet` and `go fmt` validate does not capture
several issues.

The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```

The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```

Fixed above issues with `go vet` and `go fmt -s`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ace786e9d517777473bd431e65d6c464d82e4f65
Component: engine
 2016-11-17 06:31:28 -08:00
Sebastiaan van Stijn
a72341ea0d Merge pull request #28498 from rhvgoyal/rwlayer-opts 
Move CreateRWLayer() parameters in a struct
Upstream-commit: 85bc735b4a56223c84971839d819ff8dc494c181
Component: engine
 2016-11-17 13:57:59 +01:00
Sebastiaan van Stijn
9b39de5905 Merge pull request #28512 from anusha-ragunathan/fix_enable 
Cleanup after plugin install.
Upstream-commit: a58e3e7fefd67ebe57c183e970e5fcda096c9ad1
Component: engine
 2016-11-17 10:16:47 +01:00
zteBill
2b31c00bf1 make each return explicitly 
Signed-off-by: zteBill <bi.zhenkun@zte.com.cn>
Upstream-commit: 4b3a1bbda5613ee12d4e94f7797fca51139109a6
Component: engine
 2016-11-17 17:13:25 +08:00
Sebastiaan van Stijn
aeb7ad65ac Merge pull request #28534 from cizixs/changelog-typo 
Fix 1.13.0 changelog typo
Upstream-commit: f47ae61293a69fc0f7d867897b869e7ce4ff4670
Component: engine
 2016-11-17 09:57:03 +01:00
Vincent Demeester
40c13459fc Merge pull request #28521 from aaronlehmann/omitempty 
api: Remove omitempty tag on Parallelism
Upstream-commit: 465c0484dc9db73fa9578af58e3dddbf94d8fceb
Component: engine
 2016-11-17 09:05:29 +01:00
Victor Vieux
1d59d8efa7 Merge pull request #28530 from stevvooe/derandom-error-codes 
api/server/httputils: ensure consistent status code
Upstream-commit: e93bd7b8ce01802df25bb83af801a2a45c148cc4
Component: engine
 2016-11-16 23:52:52 -08:00
yupeng
700764fb6d Fix the typo 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 9551dd03cfad2ec0a00d89c2177fb7b45b6ad885
Component: engine
 2016-11-17 14:13:38 +08:00
allencloud
061156aacb remove unused error ErrPendingSwarmExists 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7777557a3a8599fbbd8e9a04d7328898c663ded1
Component: engine
 2016-11-17 14:06:08 +08:00
cizixs
8b3a0db514 Fix 1.13.0 changelog typo 
Signed-off-by: wei wu <wuwei4455@gmail.com>
Upstream-commit: e99e694502b2763b01bc09d5d7c818d9d8ffc991
Component: engine
 2016-11-17 12:24:44 +08:00
Brian Goff
f10695300a Use WaitWithContext for WaitStop 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 36d6d76a41be4973eed98f64a565f8cf92dc16e0
Component: engine
 2016-11-16 22:08:37 -05:00
Stephen J Day
3c5187452a api/server/httputils: ensure consistent status code 
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 3484e02590117d175d9c1ab24c583390b4e94a55
Component: engine
 2016-11-16 18:58:55 -08:00
He Xin
2bd4fbcf97 fix bugs 'fatal error: concurrent map read and map write' to change VolumeStore.globalLock type from Mutex to RWMutex, and add globalLock.RLock() for the read of names, refs, labels and options in VolumeStore 
Signed-off-by: He Xin <he_xinworld@126.com>
Upstream-commit: 19bd1cee236b85d2e24fdf49d6181edb7e1f7f17
Component: engine
 2016-11-17 10:48:19 +08:00
Andrea Luzzardi
01fd03f430 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: fbe87907597dcea5a5ac493689556873b16a809f
Component: engine
 2016-11-16 18:15:15 -08:00