Commit Graph

4130 Commits

Author SHA1 Message Date
97516856c4 Remove restartmanager from libcontainerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 606a245d8548e98e889df1b9cf511b5953a309b9
Component: engine
2016-10-07 12:09:54 -07:00
dca3d10db4 Merge pull request #26996 from Microsoft/jjh/imageinspectosversion
(Windows) Inspect image populate OSVersion
Upstream-commit: febf53d91a43fe13fbb802d9e6b7b6732183cf21
Component: engine
2016-10-07 18:33:01 +02:00
d1b375bf46 Merge pull request #23389 from Microsoft/jjh/credentialspec
Windows: Support credential specs
Upstream-commit: b3cc3d7bf9606b64833d5596fee84bff416652c3
Component: engine
2016-10-07 18:32:44 +02:00
6be324c5f4 Merge pull request #26882 from runcom/proxy-path
Specify userland proxy path
Upstream-commit: 91312f71aabe4f0840060049259fc6dbfcc62cd2
Component: engine
2016-10-07 09:44:39 +02:00
e61236d868 Inspect populate image OSVersion
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7f537e811d40244c76da93319e3f6f30c4c88e3
Component: engine
2016-10-06 11:46:24 -07:00
75a301f015 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
2016-10-06 09:32:22 -07:00
b79ddee1da daemon: add --userland-proxy-path flag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dd2e1947dc58d6807a5ddc401f84184fc5a77c2a
Component: engine
2016-10-06 17:31:53 +02:00
a4c533dd30 Merge pull request #27167 from Microsoft/jjh/blockexport
Windows: export not supported
Upstream-commit: f19120c305de68b1af5062479c19894fc85ecbb3
Component: engine
2016-10-06 16:05:36 +02:00
ad2852600f Windows: export not supported
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 73932d8d22915b02f9e55158f05bf5f85505e875
Component: engine
2016-10-05 13:15:44 -07:00
4ab9943ca0 Fixing servicing bug by always specifying LayerFolderPath
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates.  Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 78540d0d181d581342b0a2750786ae91e6ed9f91
Component: engine
2016-10-04 15:29:30 -07:00
19c07b3df2 Merge pull request #26989 from aboch/none
Respect --bridge=none
Upstream-commit: 694ba71e365c6b9aa7472a9ef29bbde3cba6dce2
Component: engine
2016-10-04 16:25:39 +02:00
6d8d7fa57b Merge pull request #27136 from allencloud/add-lock-in-libcontainerd
add lock in libcontainerd client AddProcess of Windows
Upstream-commit: 5e072a25f80f13028fdb86df4179a8ee60cbde90
Component: engine
2016-10-04 09:29:59 -04:00
43c9d470cf add lock in libcontainerd client AddProcess of Windows
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5143be0ccf70c7cb2acc2aa39fd7ec47450e5daa
Component: engine
2016-10-04 10:29:21 +08:00
c99a6c9099 Merge pull request #26860 from anusha-ragunathan/nw-pv2
Make libnetwork use pluginv2.
Upstream-commit: 0cc7f0185f59f9271b7b783b776dac74347e8f51
Component: engine
2016-10-03 17:12:16 -07:00
543881c701 Shutdown plugins after containers.
Fixes #26278

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: ed6e30767e27537ce342baa17659d983a76c5b7e
Component: engine
2016-10-03 15:52:44 -07:00
bc1c43e903 Respect --bridge=none
- Do not create the default "bridge" network
- Get rid of the docker0 bridge

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: a0af884d3a499460bdb8b41bc7cd61b1a56e6d22
Component: engine
2016-10-03 11:08:34 -07:00
8ca73d18af Initialize libnetwork and IPAMDriver with pluginstore.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: a00940f02c2699c091ebffb47f4c2d7f14f284d9
Component: engine
2016-10-03 10:40:05 -07:00
51ec6bcf96 Merge pull request #27062 from yank1/Inconsistency-"on_failure"-vs-"on-failure"
Fix conversion of restart-policy from GRPC
Upstream-commit: 6e8a2cd29113896acfc3f97a43dd27f751f2f519
Component: engine
2016-10-01 10:39:00 +02:00
dcd98584e4 Merge pull request #26108 from mlaventure/data-mngt
New Data Management commands
Upstream-commit: 86de7c000f5d854051369754ad1769194e8dd5e1
Component: engine
2016-10-01 03:17:18 +00:00
27aa54380b Add new df subcomand to the system command
This command display the state of the data usage of the docker daemon.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b650a7bd27dcdbb4cddbfdc2cf62f41b5a8e8652
Component: engine
2016-09-30 14:35:23 -07:00
f44fc82a36 Merge pull request #26961 from Microsoft/jjh/oci
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
2016-09-30 10:13:57 -07:00
2062fd3e44 Fix conversion of restart-policy from GRPC
restart-condition for services from "on_failure" to "on-failure".

Since GRPC does not support dashes in properties, this change
added a conversion when _setting_ the restart-condition.

However, when inspecting a service, no conversion took place
from the internal GRPC value, resulting in "on_failure" to
be shown.

This change updates the conversion to fix this, and removes
a "hack" that was previously used for this, now using a
Switch to compare to actual types.

Before this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on_failure","MaxAttempts":0}

Afer this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on-failure","MaxAttempts":0}

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
Upstream-commit: bc32fcabebb5f3a83d47c00d85317ce82c963edf
Component: engine
2016-09-30 15:54:47 +08:00
3616bb2973 Fix missing hostname and links in exec env
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e98145960988a2259074ae911b6478b7a940748b
Component: engine
2016-09-29 13:46:10 -07:00
200598ef34 Merge pull request #26994 from Microsoft/jjh/fix26461regression
Windows: Don't set PATH/TERM on exec
Upstream-commit: 1d669d82c1d5691f9706112acdbe4f70812cf6aa
Component: engine
2016-09-29 13:34:12 -07:00
a3bb730c44 Merge pull request #24411 from vdemeester/24393-ps-filter-managed
Add a new "is-task" ps filter
Upstream-commit: b6ad6d98fd5037c44cc38d000e5a35bd808bff7d
Component: engine
2016-09-29 18:54:15 +02:00
2850aab072 Add /{containers,volumes,images}/prune API endpoint
These new endpoints request the daemon to delete all resources
considered "unused" in their respective category:
  - all stopped containers
  - all volumes not attached to any containers
  - images with no associated containers

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 33f4d68f4dc0506382c31b908905480ab0e559fa
Component: engine
2016-09-29 07:42:53 -07:00
04e5c4c974 Add /system/df API endpoint
This endpoint return data regarding the space used by docker on disk

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: f2e11fb8d1284626d40bb916ad6a21a316e5ab9c
Component: engine
2016-09-29 07:42:53 -07:00
8c08789756 Update Images() to allow retrieving specific image size data
Those data include:
 - size of data shared with other images
 - size of data unique to a given image
 - how many containers are using a given image

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b717de5153db503fae61c11e30f04f400f66a6fd
Component: engine
2016-09-29 07:42:53 -07:00
f0f455579a Add Size and RefCount fields to types.Volume
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: c6db1e9c1b1c015a69a37e4efc570cb44d801168
Component: engine
2016-09-29 07:42:53 -07:00
c01ac0b550 Windows: Don't set PATH/TERM on exec
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e880bbc48bd94762489a9948814d3edea39fdcfa
Component: engine
2016-09-28 13:42:27 -07:00
ac8256a95d Merge pull request #26972 from allencloud/clear-health-monitor-log
make health check log more readable
Upstream-commit: 601004e1a714d77d3a43e957b8ae8adbc867b280
Component: engine
2016-09-28 14:22:43 +02:00
8a19fb43a4 Merge pull request #26941 from runcom/docker-init-path-1
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
48a609d72c Add a new "is-task" ps filter
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
2016-09-28 12:45:30 +02:00
f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
a7102311d0 make health check log more readable
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a4a4f3733f18053269293d6f2e56767c564940d3
Component: engine
2016-09-28 14:10:15 +08:00
434bea436a Remove hacked Windows OCI spec, compile fixups
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02309170a5fb97d40260d0ee9e24b44be8c780b2
Component: engine
2016-09-27 12:07:35 -07:00
be83d1256c Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
4ab44ced86 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
fa6f37076c Merge pull request #26898 from YuPengZTE/devErrorsNew
In error, the first letter is low-case letter
Upstream-commit: c2f57291ac04a1d582d7fcdedda7b1ad707543d5
Component: engine
2016-09-27 10:10:57 -04:00
195692ee1c configure docker-init binary path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
562ec15f92 Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
672761b64e make client side know container removal in progress
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
67175b8b48 Merge pull request #24634 from thaJeztah/make-network-name-required
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
ebdbeeeb36 In error, the first letter is low-case letter
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 110ab746ba50e9febcdd246671f258036c71e59a
Component: engine
2016-09-27 10:40:07 +08:00
361ed59824 Fix partial/full filter issue in service tasks --filter
This fix tries to address the issue related to 24108 and 24790, and
also the case from 24620#issuecomment-233715656

The reason for the failure case in the above mentioned issues is that
currently Task names are actually indexed by Service Name
(`e.ServiceAnnotations.Name`)

To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been
opened separately.

This fix adds the integration tests for the above mentioned issues.
Swarmkit revendoring is needed to completely fix the issues.

This fix fixes 24108.
This fix fixes 24790.
This fix is related to 24620.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f676fc93c3791f72938a6be9c7517ac620c02d1c
Component: engine
2016-09-26 16:01:20 -07:00
c712a740c1 Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info
fix #26890 avoid duplicate overlay drivers in info
Upstream-commit: 8dc63675c547d0f29f03b1e0e042b8045245d02f
Component: engine
2016-09-26 14:42:39 -07:00
80748a530c Merge pull request #26927 from thaJeztah/update-layerstore-for-solaris
Add setupInitLayer() placeholder for Solaris
Upstream-commit: 5a8cee5ab6ba640939b1fec27596ebb1eb572988
Component: engine
2016-09-26 14:36:58 -07:00
9a2a361f03 Merge pull request #26536 from anusha-ragunathan/aufs_unmount
Add retry logic during aufs unmount.
Upstream-commit: c35ab68665d0fbaa759150e8f13703a2f79b2e75
Component: engine
2016-09-26 13:17:12 -07:00
b667e379f0 Add setupInitLayer() placeholder for Solaris
Commit d2bc5d62761c24866e4b0ff4099dd54264bd9325 added
a setupInitLayer() for all platforms, but did not
add a placeholder for Solaris.

This adds the missing placeholder.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb2fbaa3f2c59bf4a78a3f642fe99a74e3e33b3e
Component: engine
2016-09-26 22:05:28 +02:00
6352e3e776 API return network-list if no network-name or id is provided
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.

This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).

Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00