Commit Graph
36884 Commits
Author SHA1 Message Date
Victor Vieux 3164628a33 refactor help func in CLI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 05ddb16e59
Component: cli
2016-11-17 10:54:10 -08:00
Victor Vieux 7487e32054 refactor help func in CLI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 55908f8a82
Component: cli
2016-11-17 10:54:10 -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 7e9ea5342a 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: d691bce8c9
Component: cli
2016-11-17 06:31:28 -08: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 49392d9004 Merge pull request #28512 from anusha-ragunathan/fix_enable
Cleanup after plugin install.
Upstream-commit: d9a5f6c80e
Component: cli
2016-11-17 10:16:47 +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
Qiang Huang e6ecd89a1b Add make deb support for aarch64
Fixes: #27045

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a532ff8cc387ba1d6d98eb2456dd53d97d3eca4b
Component: engine
2016-11-17 09:38:17 +08:00
Yong Tang 7899bc9ada 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: 4488d9f9fb
Component: cli
2016-11-16 17:26:03 -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 021e1a51ce Merge pull request #28322 from Microsoft/jjh/api1.26
Bump API to v1.26
Upstream-commit: 6e6b37b0a2
Component: cli
2016-11-17 00:01:46 +01: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 656a0c42be 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: 4749582510
Component: cli
2016-11-16 14:45:51 -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
Yong Tang 75b9b9e6bd Use map[string]bool for preProcessor to ignore unknwon field
This fix is an attempt to address the issue raised in 28339. In
`docker ps`, the formatter needs to expose all fields of `types.Container`
to `preProcessor` so that template could be executed.

This direct exposing is unreliable and could cause issues as user may incorrectly
assume all fields in `types.Container` will be available for templating.

However, the purpose of `preProcessor` is to only find out if `.Size`
is defined (so that opts.size could be set accordingly).

This fix defines `preProcessor` as `map[string]bool` with a func `Size()`.
In this way, any unknown fields will be ignored.

This fix adds several test cases to the existing `TestBuildContainerListOptions`.

This fix fixes 28339.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3c56459801
Component: cli
2016-11-16 13:23:47 -08:00
Yong Tang 6c1518dd39 Use map[string]bool for preProcessor to ignore unknwon field
This fix is an attempt to address the issue raised in 28339. In
`docker ps`, the formatter needs to expose all fields of `types.Container`
to `preProcessor` so that template could be executed.

This direct exposing is unreliable and could cause issues as user may incorrectly
assume all fields in `types.Container` will be available for templating.

However, the purpose of `preProcessor` is to only find out if `.Size`
is defined (so that opts.size could be set accordingly).

This fix defines `preProcessor` as `map[string]bool` with a func `Size()`.
In this way, any unknown fields will be ignored.

This fix adds several test cases to the existing `TestBuildContainerListOptions`.

This fix fixes 28339.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 312cc7eebd326cc500e5742115d1e92e94ff60ee
Component: engine
2016-11-16 13:23:47 -08:00
Tonis Tiigi cfe7cb61c6 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: 28f8f92963
Component: cli
2016-11-16 13:19:45 -08: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
Vivek Goyal 1f1219e7ad devmapper: get rid of unused device id argument in unregisterDevice()
There is no need to populate device id during unregisterDevice(). Nobody
makes use of this information. We just need to remove file associated
with device and that file is looked up using the hash and not the
device id which is used for thin pool operations.

So get rid of device id argument to unregisterDevice().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 288f933ed57581b5d8b9abb097bf531a55774d82
Component: engine
2016-11-16 16:16:46 -05: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
Brian Goff 594f65145f Move stack dump dir to exec root
Dump stack dumps to exec root instead of daemon root.
When no path is provided to the stack dumper, such is the case with
SIGQUIT, dump to stderr.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0bd720b28dc7b416fe2193bdafaca011ec24d032
Component: engine
2016-11-16 12:55:18 -05: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