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,089 Commits 12 Branches 297 Tags
3dbc7d041703b322eddd0eef30cdb59dd1ea6b8c
Commit Graph

29089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Victor Vieux
2c87a5fc33 Merge pull request #28537 from YuPengZTE/devTypo 
Fix the typo
Upstream-commit: d75f5178f85e1dd551d55c25e724a99be5da99bb
Component: engine
 2016-11-16 23:49: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
Yong Tang
a8652362f7 Fix crash caused by docker service inspect --pretty 
This fix tries to fix the crash caused by `docker service inspect --pretty`,
by performing necessary nil pointer check.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b6857e91c1625695abbf5897e13f688028880c33
Component: engine
 2016-11-16 17:26:03 -08:00
Victor Vieux
fddeef3e5c Merge pull request #28505 from Microsoft/jjh/revert27884 
Windows: Revert 27884
Upstream-commit: 956ff8f773d35181e4408cc0cd2ffa4994d8c1d5
Component: engine
 2016-11-16 17:12:19 -08:00
Sebastiaan van Stijn
8ad8a4c329 Merge pull request #28100 from nwt/disable-v1-protocol-for-default-registry 
Disable v1 protocol for the default registry
Upstream-commit: a5dce0cb1ac70924d5f2d8b9e146eee492c2fb5b
Component: engine
 2016-11-17 01:25:31 +01:00
Aaron Lehmann
33ab332c50 api: Remove omitempty tag on Parallelism 
It doesn't make sense to use omitempty here. 0 is a meaningful value and
it's different from the default. If someone sets Parallelism to 0, we
want to show that Parallelism is 0, not hide the field.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d8b8b129948ef8586f5b2f576533952419e302f2
Component: engine
 2016-11-16 16:21:25 -08:00
Victor Vieux
1f521b82ca Merge pull request #28501 from tonistiigi/fix-daemon-cmd 
Skip cli initialization for daemon command
Upstream-commit: bb845dbd423e5107dcdba45bb94c4e8d54e5997b
Component: engine
 2016-11-16 15:37:43 -08:00
Sebastiaan van Stijn
9fe7b62295 Merge pull request #28322 from Microsoft/jjh/api1.26 
Bump API to v1.26
Upstream-commit: 3f9dc0213583c7e903bebb02733df1e9ec9263b6
Component: engine
 2016-11-17 00:01:46 +01:00
Victor Vieux
455a911a8a Merge pull request #27749 from riyazdf/plugin-doc-edits 
Edits to plugin docs after building authz plugin
Upstream-commit: 895bf6b0537ff039f188246e3756312fbec4a59e
Component: engine
 2016-11-16 15:01:16 -08:00
Anusha Ragunathan
6f5b54ba77 Cleanup after plugin install. 
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 1144f8f1d4b1fd2bbf1f41bf5dad8d929d0dc06e
Component: engine
 2016-11-16 14:45:51 -08:00
John Howard
3e22d4d10e Windows: Revert 27884 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7e03ce3f13baa61ce5547574163059b712b37025
Component: engine
 2016-11-16 13:38:45 -08:00
Anusha Ragunathan
996cc41e18 Merge pull request #28457 from vieux/proper_error_plugin_windows 
explicitly show plugins as unsupported on !linux
Upstream-commit: 5659296f15d37c2a8272ab63ed09df47122caf6a
Component: engine
 2016-11-16 13:36:21 -08:00
Vivek Goyal
98fb763827 Move CreateRWLayer() parameters in a struct 
Move some of the optional parameters of CreateRWLayer() in a struct
called CreateRWLayerOpts. This will make it easy to add more options
arguments without having to change signature of CreateRWLayer().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: f7f3d34210fd8d25a929c6b9048e74e7ee40a558
Component: engine
 2016-11-16 16:31:23 -05:00
Tonis Tiigi
43c58c892c Skip cli initialization for daemon command 
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5b0a52f7dcd04017a1def7326f8adbb8547ebe89
Component: engine
 2016-11-16 13:19:45 -08:00
Victor Vieux
73004a6b58 Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack 
Remove old Windows hack in make.sh
Upstream-commit: 77fca662dd71da6be7fd4bb3b40f7074b355607e
Component: engine
 2016-11-16 11:38:19 -08:00
Riyaz Faizullabhoy
397de7b28c Edits to plugin docs after building authz plugin 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: a524c135dce6ce39ccbca68fdd38f5b575ad82f4
Component: engine
 2016-11-16 09:53:23 -08:00
Michael Crosby
d37cd17630 Merge pull request #28420 from vieux/update_tini 
update tini to a87614212b3a51a9cad57ff7989103a841546745
Upstream-commit: 1c29c3a54d7194148d569ef2cbac53dbc12a5165
Component: engine
 2016-11-16 09:46:11 -08:00
John Howard
a498054fff Remove old Windows hack in make.sh 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5e6f8cb4a7f8bf294b3b459d2c2afed6d69fcdf1
Component: engine
 2016-11-16 09:29:38 -08:00
Vincent Demeester
7acf8456de Merge pull request #27631 from allencloud/get-node-brefore-update 
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
 2016-11-16 17:47:31 +01:00