toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,232 Commits 3 Branches 295 Tags
4f3eebb317ab005e2b36eebfcddbce63fd5eef99
Commit Graph
5013 Commits
Author SHA1 Message Date
Thomas Leonard ad4741351f Reset health status to starting when a container is restarted 
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: b8793cff48fc4c1b702917ebc528ca0c60fb3397
Component: engine
 2016-10-14 15:49:12 +01:00
Tibor Vass 86c7d2f369 Merge pull request #27027 from tonistiigi/fix-name-collision 
Fix name collision handling in restore
Upstream-commit: 9ced849832dc7a5f15f7fda6d2f3bdb38bbf5483
Component: engine
 2016-10-14 08:59:56 +02:00
Sebastiaan van Stijn 1e912551c1 Merge pull request #27335 from barracks510/master 
Simplify function signature
Upstream-commit: 429812f86a7095c19ae48552f6b97150846ca29b
Component: engine
 2016-10-13 18:54:01 -07:00
John Howard 763c2d8e2f Windows: Factor out unused fields in container 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 600f0ad21142f4085330107f629a80099af0490f
Component: engine
 2016-10-13 14:51:10 -07:00
Elena Morozova 4b9781e130 all: replace loop with single append 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
Upstream-commit: 64238fef8c7b739a2ae5648386cf594eb3a162e5
Component: engine
 2016-10-13 13:31:52 -07:00
Sebastiaan van Stijn 9d1492de52 Merge pull request #27207 from tonistiigi/deprecate-repo-shortid 
Deprecate repo:shortid syntax
Upstream-commit: 0542dcc2d05d74081d185c35bc4a92716f348506
Component: engine
 2016-10-12 23:44:38 -07:00
Dennis Chen bec868f66a Simplify function signature 
Signed-off-by: Dennis Chen <barracks510@gmail.com>
Upstream-commit: 445620f231ccd2a99e5ebb8fc004dcb254cc2c4b
Component: engine
 2016-10-12 21:31:55 -04:00
Darren Stahl c622fde306 Stop expanding sandbox size when no new size is specified 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0da31c68f11d6e2a795b4e4faf7f969916db5f81
Component: engine
 2016-10-12 16:58:57 -07:00
Tibor Vass 1f94129ec0 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz 
Make authz use pluginv2
Upstream-commit: 8658748ef716e43a5f6d834825d818012ed6e2c4
Component: engine
 2016-10-13 00:28:43 +02:00
Sebastiaan van Stijn fa70234a33 Merge pull request #27294 from mlaventure/hide-unused-volume-fields 
Move types.Volumes optional fields under a new type
Upstream-commit: a7db0a8402c5e770501adb7a1efb82adff65e3f8
Component: engine
 2016-10-11 23:55:25 +02:00
Anusha Ragunathan d71f1080b9 Make authorization plugins use pluginv2. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: c5393ee147e981ded8fdf12c8da790abd1130175
Component: engine
 2016-10-11 13:09:28 -07:00
Kenfe-Mickael Laventure 3dd231fb94 Move types.Volumes optional fields under a new type 
This allows us to hide those fields when they are not filled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d36952749d7db1a7dac40f7ddf3ed485f23b33fc
Component: engine
 2016-10-11 11:49:26 -07:00
Anusha Ragunathan effa6f4094 Update plugingetter import path in docker/docker. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: a98be0344b24d71235c17a87ff425f3d602e48e8
Component: engine
 2016-10-11 11:24:18 -07:00
Sebastiaan van Stijn e8a02789bc Merge pull request #26896 from jmzwcn/issue26244 
Fix issue26244:swarm service, with overlay network, fails to remove all containers
Upstream-commit: f7d1682c604429fcdf3c2c2225bde324b0861780
Component: engine
 2016-10-11 14:40:39 +02:00
Justin Cormack 23ee37555b Merge pull request #26690 from mwhudson/ignore-oom_score_adj-failure 
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
Upstream-commit: d316e172da464bd7fb88e45069cb459f90f710bd
Component: engine
 2016-10-11 10:01:22 +01:00
Tõnis Tiigi 1ec6d6cfdb Merge pull request #27259 from LK4D4/no_map_pointers 
daemon: do not use pointers to map
Upstream-commit: 2945f902bdd090811d840c288bbe7e7072804ea6
Component: engine
 2016-10-10 13:15:03 -07:00
Alexander Morozov aaf0ce0824 daemon: do not use pointers to map 
Also, do not shadow err with :=

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 44c280afbf27534dffdbc9c462692e4d2d3cc99a
Component: engine
 2016-10-10 11:37:36 -07:00
Justin Cormack 9893841bd2 Merge pull request #27230 from allencloud/fix-bugs-in-prune 
better prune and system df
Upstream-commit: b5cbd84439d212f658a065eda5f7797223853874
Component: engine
 2016-10-10 19:30:06 +01:00
Kenfe-Mickaël Laventure 78b5fb2443 Merge pull request #27209 from tonistiigi/sleep-between-layers 
Fix naivediffdriver timestamp precision bug
Upstream-commit: 7ba31540f0ec4e36608160421172e03f92815336
Component: engine
 2016-10-10 10:24:49 -07:00
allencloud 5f64850ff1 better prune and system df 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: fd62b6c9505451670b926216648ab7f6a3f9f586
Component: engine
 2016-10-11 00:42:21 +08:00
Daniel Zhang 5c631e04b7 fix issue26244 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: 434eae7dfd1612d8de292480d4c31c68fceffa68
Component: engine
 2016-10-09 12:36:44 +08:00
Tonis Tiigi f43049507b Fix naivediffdriver timestamp precision bug 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d1a83059f700ea7a15a4f17f4ed833f023ec3398
Component: engine
 2016-10-07 13:52:17 -07:00
Tonis Tiigi 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Carlos Alexandro Becker e66a3ee7ff added logentries driver 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
Upstream-commit: 2764d67c3a85cf638e211a1cfb0808e9eba7edb9
Component: engine
 2016-10-06 22:48:53 -03:00
Tonis Tiigi 97d4a7602c Deprecate repo:shortid syntax 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5fc71599a0b77189f0fedf629ed43c7f7067956c
Component: engine
 2016-10-06 17:12:17 -07:00
John Howard 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
John Howard 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
Antonio Murdaca 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
Brian Goff 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
John Howard 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
Stefan J. Wernli 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
Vivek Goyal bcbcfef3bc Warn if kernel does not support overlay/overlay2 with selinux 
We first added error to not allow overlay with selinux enabled. Then later
we removed it as kernel was getting close to get the support. But this 
means user does not get meaningful message on old kernels.

This patch introduces a warning (Instead of error). Difference is that it
dynamically tries to detect if underlying kernel supports overlayfs with
selinux or not. And if it does not, it warns.

It will not warn if it detects that kernel supports overlayfs with selinux.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 885b29df096db1d6746ece4b3a298a1ffe85716d
Component: engine
 2016-10-04 15:35:56 -04:00
Vincent Demeester 19c07b3df2 Merge pull request #26989 from aboch/none 
Respect --bridge=none
Upstream-commit: 694ba71e365c6b9aa7472a9ef29bbde3cba6dce2
Component: engine
 2016-10-04 16:25:39 +02:00
Brian Goff 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
allencloud 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
Anusha Ragunathan 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
Anusha Ragunathan 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
Tonis Tiigi bcbed9fbcc Don’t attempt to reconnect swarm on failed join after timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7381c84bfb9d586a5a7b87a9d6bcaf3ee15a4256
Component: engine
 2016-10-03 13:38:01 -07:00
Alessandro Boch 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
Anusha Ragunathan 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
Vincent Demeester 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
Arnaud Porterie 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
Kenfe-Mickael Laventure 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
Michael Crosby 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
Kay Yan 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
Tonis Tiigi 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
Michael Crosby 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