69889bcffd
Merge pull request #32222 from unclejack/small_cleanup
...
Small cleanup
Upstream-commit: 9c0473fa652307c842f0f16297c4a38d409dfb60
Component: engine
2017-03-30 21:09:39 +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
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
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
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
f457c9133a
Merge pull request #32215 from tiborvass/docs-yaml-fix-makefile
...
docs: fix Makefile for yaml docs generation
Upstream-commit: 5ec88474b78faf721e4d90a902e0266d4388699c
Component: engine
2017-03-29 16:38:11 -07:00
eb7698949e
Add line to hack/make/cross to cross-compile pkgs directory
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 8eb7edab7cc62bcbf581713f3f1e615cfdef04b4
Component: engine
2017-03-29 15:58:03 -07:00
f40a2957a7
docs: fix Makefile for yaml docs generation
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 36bd288162aed2baefd41d942bca46083e2f1973
Component: engine
2017-03-29 15:07:16 -07:00
7b9ebed75d
plugins: Rename plugins_linux.go to plugins_unix.go and use build tags
...
This allows pkg/authorization to build on OS X.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3da119282806187079b1a6dfdfb0de7631a78647
Component: engine
2017-03-29 14:06:59 -07:00
f69e623ac6
Merge pull request #32200 from yuexiao-wang/update-usage
...
fix inconsistency for docker service ps
Upstream-commit: 278b36e5ce2f3be6d2db9a9b39b1e7357aaeab7b
Component: engine
2017-03-29 13:58:14 -07:00
2c4ec5df35
fix inconsistency for
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 6d50737355f748cbb49d304d0b2dbfe5a17dfd16
Component: engine
2017-03-30 05:42:18 +08:00
4c928b6538
Add bash completion for secret ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 31a8965dd40ad576891d0c98f23b53d6aaf63ece
Component: engine
2017-03-29 13:54:38 -07:00
6cde7caeb4
Merge pull request #32211 from vieux/stretch_without_lsb
...
install: map debian_version 9.X to debian stretch without lsb_release
Upstream-commit: bbae982ac8045e26d3eba96affa496fa81c715be
Component: engine
2017-03-29 20:56:45 +02:00
07a4e75873
install: map debian_version 9.X to debian stretch without lsb_release
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: f8360d002d6e54e923d817bda5409835829119fc
Component: engine
2017-03-29 11:36:34 -07:00
e12d1ca192
Vendoring vishvananda/netlink @c682914
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 694c787123fdf24912c99f1c205e9b4559c4872a
Component: engine
2017-03-29 10:58:02 -07:00
f07c46d2c5
delete generated rpm "changelog"
...
The generated "changelog" was not removed
before re-generating, causing the changelog
to be added twice on repeated runs of "make rpm"
(when bind-mounting the local source).
As a result, rpms failed to build, because
the resulting file had entries in non-chronological
order.
This change removes the generated file
before re-generating, and adds the file
to .gitignore, to prevent it from
accidentally being added to source control.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 089b71443a0f0428a53c41c71513905f64c22f69
Component: engine
2017-03-29 18:19:07 +02:00
487d9cf34a
Merge pull request #31830 from dnephin/refactor-cli-state
...
Small cleanup now that we have multiple details about the server stored on the cli
Upstream-commit: bce494f7a2ce0e1a2c6563b2e32e5a8bacb128ba
Component: engine
2017-03-29 13:36:32 +02:00
8c855d493e
Merge pull request #31501 from thtanaka/update-oracle-selinux
...
Update oracle linux selinux to match docker upstream
Upstream-commit: 1b2f07a2f148f807d08a409d5433b39a2a0b5f91
Component: engine
2017-03-29 13:15:28 +02:00
782c08e446
Merge pull request #32196 from vdemeester/fix-windowsrs1-integration
...
Fix TestAPIDockerAPIVersion on windows
Upstream-commit: 0937dadfdff35a061a6bcd5bf661a4c112f0aafb
Component: engine
2017-03-29 12:45:31 +02:00
7e1b5a4349
Merge pull request #32198 from FengtuWang/wrong_usage
...
fix wrong usage in script of integration test
Upstream-commit: d54c8baca4e9a181e4167bb0f3966ef0aeaec31b
Component: engine
2017-03-29 12:42:47 +02:00
b3d8de4a6a
Merge pull request #32058 from tophj-ibm/flaky-token-test
...
Fix flaky test TestPushMisconfiguredTokenServiceResponseError
Upstream-commit: 6263c3cf2ef22919da0966dba1d26178c84113fa
Component: engine
2017-03-29 12:30:16 +02:00
f7e4434623
fix wrong usage in script of integration test
...
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com >
Upstream-commit: a42e72814f60715bb68d8ee918d26be0946f5662
Component: engine
2017-03-29 18:23:06 +08:00
521bbe4929
Merge pull request #32085 from aboch/bd
...
Do not panic on redundant UpdateAttachment
Upstream-commit: a1099010b097ad1090d6c50e626de7c49c113af2
Component: engine
2017-03-29 12:04:05 +02:00
61aef99b4b
Merge pull request #32187 from tianon/tini-version-parsing
...
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
Upstream-commit: d9c4261964fc4c93d2e34de650a33936ebbf7f9c
Component: engine
2017-03-29 12:01:03 +02:00
6e632614a7
fix TestDaemonRestartWithInvalidBasesize
...
NotNil is expected behaviour, daemon should not start with
invalid base size.
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com >
Upstream-commit: 1d74b4f6d4990901b918d82957bef4bb5f41294c
Component: engine
2017-03-29 17:32:25 +08:00
dbb9dec606
Merge pull request #32186 from aaronlehmann/cluster-omitempty
...
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
Upstream-commit: 4180211d808c74682636f98ed16cd1990c842fc2
Component: engine
2017-03-29 10:38:52 +02:00
85d0a25703
Merge pull request #29228 from dnephin/add-entrypoint-to-service-cli
...
Add entrypoint flags to service cli.
Upstream-commit: cf19bd44afb6dd5a4a523809175d878a6e9367ba
Component: engine
2017-03-29 10:38:33 +02:00
3ac53cbeaa
Merge pull request #32167 from miaoyq/print-a-err-return
...
The returned err should be printed
Upstream-commit: 02faf807a2944936b1308092499d35fd650edab4
Component: engine
2017-03-29 10:36:05 +02:00
cdaff4626f
Fix TestAPIDockerAPIVersion on windows
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8c7fdddf480b39b79c688e1d555ca7f18fc5fd70
Component: engine
2017-03-29 10:28:51 +02:00
f8de9e482c
Merge pull request #32175 from vdemeester/fix-30201
...
Fix TestTrustedIsolatedCreate – clean trust folder at the end of the test
Upstream-commit: 1f7fd19cec6237f1375531e6c06ebed9e7f9ab67
Component: engine
2017-03-29 09:15:51 +02:00
831fae738f
Merge pull request #32189 from vieux/17.03.1-changelog
...
backport 17.03.1 CHANGELOG
Upstream-commit: 2c1f6e812a5baa0573fb07467a988f71b1c5180b
Component: engine
2017-03-29 08:23:43 +02:00
c3332b9e26
The returned err should be printed
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 87d0a3ad890ea0d12f5e7b28f34ea835048696bd
Component: engine
2017-03-29 09:00:50 +08:00
0a80911d2d
Merge pull request #32183 from JimGalasyn/delete-h1
...
Delete extraneous H1 title
Upstream-commit: 0c59283fc35b588e245ff99fc750369677615b22
Component: engine
2017-03-29 01:42:20 +02:00
8f7143dfab
backport 17.03.1 CHANGELOG
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: d5cbaa96f6badddb8e5b04f0e5f53f1ab2206283
Component: engine
2017-03-28 16:15:05 -07:00
3e14f1327b
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 87f9362975341e5e12db5b484f662cbc525a1e41
Component: engine
2017-03-28 15:18:39 -07:00
65370eec05
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
...
Currently these fields are included in the response JSON with zero
values. It's better not to include them if the information is
unavailable (for example, on a worker node).
This turns Cluster into a pointer so that it can be left out.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3894254dddc56bf283d7361dc88953a167a3be1f
Component: engine
2017-03-28 14:20:25 -07:00
