9cde86d209
Merge pull request #32027 from sdurrheimer/zsh-completion-ps-format
...
Add zsh completion for 'docker {node,service,stack} ps --format'
Upstream-commit: 6311e9fc9d34bd874e1a6d197daef5c9c4d89791
Component: engine
2017-04-02 23:38:22 +02:00
9230ef4691
Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id
...
28722: List of containers with networkID filter is not working
Upstream-commit: 33aae7c5cc3b3689faaef39046cc6d2c6fcda4b6
Component: engine
2017-04-02 21:06:09 +02:00
6a9778f8bb
Merge pull request #32279 from darrenstahlmsft/WindowsRestore
...
Windows: Wait to delete container when restoring
Upstream-commit: c526588c7906b00659c93195aae66accab07544d
Component: engine
2017-04-02 18:38:12 +01:00
08931d138b
Merge pull request #32265 from breuner/patch-1
...
Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit d0057bd12dae5276b83e931e9e9ea185c58486a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5df76be5086fe5fee747be85fc92a0bb3ae8dada
Component: engine
2017-04-02 12:27:54 +02:00
e14b82cb5f
Merge pull request #32271 from krasi-georgiev/update-containerd-9048e5e50717ea4497b757314bad98ea3763c145
...
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
Upstream-commit: 16be0727930ef4b4683ab2d32ea60639a504d0e9
Component: engine
2017-04-02 11:02:08 +02:00
06b562ba1d
add ehazlett and johnstep to random_assign
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 4fe11d49ca464848ec5ab5550aa1f53260e410a7
Component: engine
2017-04-02 01:15:19 +02:00
1156f2a813
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
Upstream-commit: 571e4031685e730ba7cb0c49620e9f9580fdabc6
Component: engine
2017-04-01 20:52:26 +02:00
5d994cf1a3
Merge pull request #32244 from Microsoft/jjh/panicfix
...
Windows - fix panic and stderr output when service
Upstream-commit: a96de091d644db1c31b699a7a22d9ef63b376560
Component: engine
2017-04-01 20:00:59 +02:00
e0362b90f0
Merge pull request #31022 from jmzwcn/issue30994
...
docker version output is not consistent when there are downgrades or incompatibilities #30994
Upstream-commit: 3dfce9fbb813511a0dbfea1fa3bc80a37e7072c4
Component: engine
2017-03-31 15:55:03 -07:00
1d7af76811
Merge pull request #31800 from ripcurld0/checkpoint_ls
...
Use formatter in docker checkpoint ls
Upstream-commit: e45483964fc26116afa754fc9defcf1ab1dbca26
Component: engine
2017-03-31 15:54:22 -07:00
6e6d76551e
update criu to 2.12.1
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions >
Upstream-commit: d1a0afacc25ad25600ea6851d3b002734725df7e
Component: engine
2017-04-01 00:54:28 +03:00
aa11c20963
Clarify meaning of docker attach
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 1922eac4cc7190e1f3fa98796e7613c3e5b8b2bd
Component: engine
2017-03-31 13:22:21 -07:00
8ae037ac7f
Merge pull request #31599 from ripcurld0/diff_cmd_format
...
Use formatter in docker diff
Upstream-commit: 3d31198cda7d1230415b37970172480b5190c1e3
Component: engine
2017-03-31 11:19:41 -07:00
8cd4fe0243
Wait to delete container when restoring on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: dbdc8bbee4a26093e6342f93bb63a09fbe850f58
Component: engine
2017-03-31 10:59:00 -07:00
43db0dfd5f
Merge pull request #31183 from thaJeztah/log-upgrade-rollback-error
...
log error if restoring plugin fails
Upstream-commit: d57825cb1edaa5ef3833584ea09a87d282248685
Component: engine
2017-03-31 19:44:31 +02:00
75453ad8e7
Windows - fix panic and stderr
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 141a83b820140fac130840b2a0ea9df75ab4e55d
Component: engine
2017-03-31 09:51:50 -07:00
6183c882a6
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions >
Upstream-commit: a3c2ccacd08d4ff6717ea9bd1fb6ec3e0c1223c4
Component: engine
2017-03-31 19:47:05 +03:00
2fe955c1d1
Merge pull request #31634 from AkihiroSuda/clarify-env-without-value
...
api: clarify that Env var without `=` is removed from the environment
Upstream-commit: 9f9cc221bdb0a919d6ed28bdfaffa9ae2fe3a5fd
Component: engine
2017-03-31 17:34:32 +02:00
3f185ca5af
Merge pull request #27565 from rothrock/env-by-regex
...
[splunk] Use a regex to match environment variables
Upstream-commit: 1325f667eeb42b717c2f9d369f2ee6d701a280e3
Component: engine
2017-03-31 10:46:48 -04:00
78741ddf90
fix cleanup logic if restoring plugin fails
...
The "err" output variable was masked by the "if" statement,
so the error was never updated.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5d25195f29539b3f12fa8dbc802201f93805c1c4
Component: engine
2017-03-31 16:42:30 +02:00
b3bf6afbcc
28722: List of containers with networkID filter is not working
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com >
Upstream-commit: 59b70cdabe3b5f3592e40d241377c6a9f2127dfc
Component: engine
2017-03-31 08:57:09 +00:00
f66bd50c2b
Merge pull request #28696 from jlhawn/deprecate_graph_flag
...
Deprecate --graph flag; Replace with --data-root
Upstream-commit: 1ecaed0a99331ff6140e0a714e1b50d466597775
Component: engine
2017-03-31 10:51:15 +02:00
6ede278af4
Merge pull request #32246 from aboch/vnd
...
Vendoring swarmkit @b74ec2b
Upstream-commit: 2a40b35629e23872ff516c2ab24f8f92b915393d
Component: engine
2017-03-31 10:33:57 +02:00
b0235f63ee
Merge pull request #32236 from tonistiigi/fix-cmd-shell
...
builder: Fix setting command with custom shell
Upstream-commit: 05cd8bec321934797a3e3fb38b34cd4d3b89bddc
Component: engine
2017-03-31 03:26:28 +02:00
bff9e0001a
Add ingress nw Test around consition which was panicing
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4777fb6c6b1783de01d3dbeacc2d1af33f3fabc2
Component: engine
2017-03-30 16:12:48 -07:00
214de28cc7
Vendoring swarmkit @b74ec2b
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 747f0b4ba52b25a4ede0d54cb1674f221ea3e2ed
Component: engine
2017-03-30 16:12:33 -07:00
b4a1c08afc
builder: Fix setting command with custom shell
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a1fa59ea123555a910c1de1f7b88b75000f2bec4
Component: engine
2017-03-30 13:29:21 -07:00
69889bcffd
Merge pull request #32222 from unclejack/small_cleanup
...
Small cleanup
Upstream-commit: 9c0473fa652307c842f0f16297c4a38d409dfb60
Component: engine
2017-03-30 21:09:39 +02:00
716dc85cd3
Add zsh completion for 'docker {node,service,stack} ps --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 07908f456afcf97f237c47a8598937600bee3957
Component: engine
2017-03-30 21:07:03 +02:00
27ec3a05d5
Merge pull request #32010 from dongluochen/swarmkit_vendor
...
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
Upstream-commit: 2ce39de0c81a117a025a722f78da9cd61d7fdc1b
Component: engine
2017-03-30 17:24:33 +02:00
890e256320
Merge pull request #32174 from KarthikNayak/32113
...
Dockerd: enable CORS when only `--api-cors-header` is used
Upstream-commit: 59aed5ab36b1b5b360aa230effbefd757e889329
Component: engine
2017-03-30 11:13:52 -04:00
61743ec730
Merge pull request #32124 from vdemeester/system-inspect-secret
...
Add support for `--type=secret` in `docker inspect`
Upstream-commit: ee61f28cc37d78cd40943c37c24716e5a0a635d9
Component: engine
2017-03-30 17:01:57 +02:00
0fef1812de
Merge pull request #32225 from thaJeztah/remove-flag-constant
...
Remove constant for "config-file" flag
Upstream-commit: c94e0f5d02ce7b640360010e1877609da899e245
Component: engine
2017-03-30 10:05:07 -04:00
f23397c0c0
pkg/*: clean up a few issues
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: a23c456e5a136d65d02d66af398af1e3ce3a4081
Component: engine
2017-03-30 16:50:46 +03:00
5ea7e1e7af
pkg/urlutil: don't compare to bool
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 90a44b875ca87e0b990eef24a3fb84275d0e6fb1
Component: engine
2017-03-30 16:38:01 +03:00
b17c0beaf9
pkg/file{utils,notify}: don't compare to bool
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 20d6f5c2a96b5b07341fdb57474d3615ad45a1e6
Component: engine
2017-03-30 16:38:01 +03:00
2b11da50bf
pkg/{chroot,}archive: clean up a few small issues
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 087f7307a66a347bea9335c614a28f8c2fa7ddcb
Component: engine
2017-03-30 16:37:54 +03:00
6c5413349d
Merge pull request #32213 from aaronlehmann/plugin-build-mac
...
plugins: Rename plugins_linux.go to plugins_unix.go and use build tags
Upstream-commit: 8305617510b5c1c1b622ee4e0616be6fda5e3f7e
Component: engine
2017-03-30 15:03:32 +02:00
1c4402820f
Merge pull request #32199 from yuexiao-wang/add-examples
...
provide `docker stack ps` examples
Upstream-commit: 36c2f2731da40dcd8f9bf0e05a5257179da28eb4
Component: engine
2017-03-30 15:02:48 +02:00
928807d9bf
provide examples
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: dcb4351d38607891b2d348a38951557ebef9c9fc
Component: engine
2017-03-31 05:11:36 +08:00
719f2c6960
Add conflict check for flags, and update deprecation versions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: df7a72cffa7f28c67fb25eecd113dc21822afcc0
Component: engine
2017-03-30 12:21:05 +02:00
dcff175aff
Remove constant for "config-file" flag
...
None of the daemon flags use a constant for the
flag name.
This patch removes the constant for consistency
Also removes a FIXME, that was now in the wrong
location, and added a long time ago in
353b7c8ec77b30fa83dac5ec0778193f6de8b437,
without a lot of context (and probably no longer really relevant).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9894576fb7e11d9536e09ca04193b845a33b9dec
Component: engine
2017-03-30 12:01:00 +02:00
fd940e1e8e
Deprecate --graph flag; Replace with --data-root
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 261ef1fa27c4dfefa5f686b0a4ef354a43040e58
Component: engine
2017-03-30 11:24:56 +02:00
a2c22efea2
Fixing a typo in spelling
...
Wrong tense used in a sentence
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com >
Upstream-commit: 5e1349e0839000f0a6620e139b434c1c60c733a3
Component: engine
2017-03-30 14:31:45 +05:30
37b7cdd5a7
Merge pull request #32209 from aboch/vnd
...
Vendoring vishvananda/netlink @c682914
Upstream-commit: b214d8d8933f2bef4e270b541ff4626f4996ec66
Component: engine
2017-03-30 09:56:02 +02:00
d3486384e9
Use formatter in docker diff
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 3dad39b957a008127890ddf9037c063d69b99347
Component: engine
2017-03-30 10:33:40 +03:00
0acd090fda
Merge pull request #32197 from FengtuWang/fix_TestDaemonRestartWithInvalidBasesize
...
fix TestDaemonRestartWithInvalidBasesize
Upstream-commit: f459e3af9e9f0b5cfb8b05df7ac8b344c5b18266
Component: engine
2017-03-30 10:15:48 +08:00
0564af85e5
Merge pull request #31741 from mlaventure/cleanup-tmp-on-start
...
Cleanup docker tmp dir on start
Upstream-commit: f16d1a47ccc3203f5031b10f54c109e790a12c8d
Component: engine
2017-03-30 03:14:55 +02:00
f04ee00d17
Merge pull request #32013 from albers/completion-secret-ls--format
...
Add bash completion for `secret ls --format`
Upstream-commit: 165a5c6934efb1de84937eb4df1af09b63fcb32f
Component: engine
2017-03-30 03:09:02 +02:00
ebb760e3cd
Make pkg/devicemapper and pkg/loopback depend on cgo in build tags
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 85357a1167f22be9606b770a872339df459af490
Component: engine
2017-03-29 17:55:42 -07:00
