737108710c
Merge pull request #24139 from runshenzhu/health-check
...
add health check in docker build-in swarm mode
Upstream-commit: e2fc1439a11cff5f719ae47265da135d26dd36ad
Component: engine
2016-07-11 09:43:59 -04:00
2768065432
Merge pull request #24468 from yongtang/24374-docker-info-seccomp
...
Fix seccomp output in `docker info`
Upstream-commit: bc5fa7c5e04f776ee5a4636a78b59462463b92ac
Component: engine
2016-07-10 04:22:26 -07:00
f711cd5f01
Fix seccomp output in docker info
...
This fix tries to address the issue raised in #24374 where
`docker info` outputs seccomp support in Ubuntu 14.04 but
the seccomp wass not actually supported.
The issue is that in the current docker implementation, seccomp
support is only checked against the kernel by inspect CONFIG_SECCOMP
and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled
when building docker (through golang build flag).
This fix adds a supportSeccomp boolean variable. The supportSeccomp
is only set to true when seccomp is enabled when building docker.
This fix fixes #24374 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a3b9dd89a1b19e7f84617b91f3756ae816c11035
Component: engine
2016-07-08 17:26:42 -07:00
8d74981897
Add logdrivers to executor from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8a50315f3ce89b24e3556dba288b2ce7b4daf026
Component: engine
2016-07-08 13:33:40 -07:00
7ac8dc18c4
Update executor volumes from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6586f4f0719ae59c4a2b74acd91a1a888a0018b5
Component: engine
2016-07-08 13:33:40 -07:00
e1639e03c6
Merge pull request #24358 from AkihiroSuda/fixdockertop
...
Validate arguments for `ps` in `docker top`
Upstream-commit: 152f5a5cedb062c26745cab81159b6bb2e05c0b1
Component: engine
2016-07-08 10:57:13 -07:00
eaf2bbac5f
Merge pull request #24435 from cpuguy83/24350_cleanup_on_no_running_containers
...
Fix daemon not cleaned up w/ live restore enabled
Upstream-commit: a34534fe95f0b7378837a5d5993b1058d41a635e
Component: engine
2016-07-08 10:23:14 -07:00
4e31188a93
Merge pull request #24431 from mavenugo/revert
...
Check for swarm-mode network conflict during create network
Upstream-commit: e10c11e4a1ac39a408f7503b594207e481387c87
Component: engine
2016-07-08 09:41:34 -07:00
bff94672e9
daemon: ensure we set default options to stock runtime
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 59162641cc20640afb785540b5f47178835de656
Component: engine
2016-07-08 15:58:06 +02:00
6e2ed85ac6
Validate arguments for ps in docker top
...
Fix #24357
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 253933220965574422aa6679255359d8bd15d435
Component: engine
2016-07-08 05:58:11 +00:00
fde455a0e2
Fix daemon not cleaned up w/ live restore enabled
...
This patch makes sure daemon resources are cleaned up on shutdown if
there are no running containers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2d5dc94b9b547a9ba73f7b613e358b03fdfb2b84
Component: engine
2016-07-07 22:25:41 -04:00
e4b8c6fd9c
Merge pull request #23312 from justincormack/proxy
...
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
2016-07-07 17:14:40 -07:00
9280648ffe
Revert "Fixed a few network UI issues in swarm-mode"
...
This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 4623276886033aedb4932c3996c7f61e7fc35861
Component: engine
2016-07-07 16:23:42 -07:00
2ccfe96ba1
Update swarmkit vendoring
...
Needed for libnetwork vendoring
Update Secret API name change correspondingly
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
2016-07-07 21:01:54 +01:00
f7a6ca3323
Merge pull request #22868 from Microsoft/jjh/dockerfilecmd
...
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
2016-07-07 09:21:26 -07:00
f5a13a7cbe
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
7ac01fb32e
Use newer default values for mounts CLI
...
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`
Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
2016-07-06 22:34:39 -04:00
f773935c3b
add health check in docker cluster
...
Signed-off-by: runshenzhu <runshen.zhu@gmail.com >
Upstream-commit: 1ded1f26e154e283ab26f347971d4d4a51edc94f
Component: engine
2016-07-06 13:43:20 -07:00
786983bb63
Merge pull request #24323 from avsm/better-leave-grammar
...
Improve the warning messages when leaving a Swarm cluster
Upstream-commit: c70e432cee7ce2052a729f85da31420b6c01d72c
Component: engine
2016-07-06 12:00:20 +02:00
e4dfc2d04c
Validate hostname starting from 1.24 API.
...
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
2016-07-06 09:13:59 +02:00
48bf87974d
Merge pull request #24158 from mavenugo/smissues
...
Fixed a few network UI issues in swarm-mode
Upstream-commit: 5b4131681595b6f5304f3d94868a1642f92f2998
Component: engine
2016-07-05 20:28:20 +00:00
f3ff9e9f18
Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name
...
Allow service and node filter to be name in `tasks` subcommands
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
2016-07-05 12:16:57 -07:00
eff3f9141a
Merge pull request #23996 from dmcgowan/always-store-image-digest-update
...
[carry 23503] Always store the image digest when pulling and pushing an image.
Upstream-commit: ee0283c97a44fd8e67f2df81d076eb4b1858b3d2
Component: engine
2016-07-05 16:18:20 +00:00
f2db9c3fd0
Merge pull request #24332 from allencloud/fix-typos
...
fix typos
Upstream-commit: dc31f4f6db5edff7c8554ec0725365a344bdec20
Component: engine
2016-07-05 16:29:29 +02:00
9921891219
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: edc307cb9213d11d9c5911b08ebd921a097939c0
Component: engine
2016-07-05 20:42:17 +08:00
21a36cd129
Improve the warning messages when leaving a Swarm cluster
...
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 22a3d1fa209282e938ca16f31cce0dab4f35bf72
Component: engine
2016-07-05 09:14:23 +01:00
78dacb842c
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
...
Signed-off-by: Francis Chuang <francis.chuang@boostport.com >
Upstream-commit: 1205a5584650388f36cda922556a31cbce827915
Component: engine
2016-07-05 16:18:06 +10:00
0bdbf282f3
Fix spelling in comments, strings and documentation
...
Signed-off-by: Otto Kekäläinen <otto@seravo.fi >
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
a3ed3e2e3c
Merge pull request #23947 from cpuguy83/fix_mount_target
...
Volume mounts need to use "Binds" API field
Upstream-commit: adb48487f2ec65a9facab04f1ec6c20aefb3e41f
Component: engine
2016-07-01 13:23:14 -07:00
db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
bda6fa8f54
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
9f0a770513
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
2cb691411c
Volume mounts need to use "Binds" API field
...
Swarm was putting volume type mounts into the container config's
"Volumes" field, but really these need to go into "Binds".
"Volumes" is only for normal "-v /foo" volumes, not named volumes or
anything else.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2bc2165cbf3e949921d1659f09841b5f008f590d
Component: engine
2016-06-30 17:00:52 -04:00
77d5dd2b46
Treat digest only images as dangling
...
Add test for dangling digest images
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 8906f8307c86ce59f51d2f1b750f5e698f3cf8a5
Component: engine
2016-06-30 11:32:49 -07:00
6bcf7ca500
Merge pull request #24091 from AkihiroSuda/fixZFS24008
...
zfs: call mount.MakePrivate
Upstream-commit: b8cef7c19cea0f4ee670a9362154716b2313a18f
Component: engine
2016-06-30 11:14:30 -07:00
c89614146c
Merge pull request #24007 from LK4D4/fix_close_races
...
daemon/logger: fix races in channel close
Upstream-commit: e8439971b42a65dd831f80ec76a38e8c8e938cb6
Component: engine
2016-06-30 15:21:17 +02:00
a50f4824a7
Allow service and node filter to be name…
...
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
2016-06-30 15:09:03 +02:00
660ae2c902
Merge pull request #24149 from mavenugo/kn
...
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
2016-06-30 12:23:45 +02:00
e667b026a1
Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
2016-06-30 13:06:14 +08:00
3b186ee015
Fixed a few network UI issues in swarm-mode
...
* Detect name conflicts on network creation
* Detect and prevent network connect/disconnect for managed containers
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5
Component: engine
2016-06-29 18:08:55 -07:00
bd38c4db96
Added missing flags for swarm-mode networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
2016-06-29 15:30:57 -07:00
29d2889a79
Merge pull request #23789 from tonistiigi/swarm-integration-tests
...
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
cddb6e635c
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
d4e14be148
Merge pull request #23955 from yongtang/23768-cpu-count
...
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
7dfc0b0c86
Merge pull request #24050 from ncoolz/issue-cluster-store-config
...
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
ed5060064e
zfs: call mount.MakePrivate
...
Fix #24008
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7
Component: engine
2016-06-29 01:55:45 +00:00
b75c9d3100
Passing registry auth token for service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
2016-06-28 13:53:01 -07:00
