e450737ae9
Update Erica in mailmap
...
Fix my name and email address.
Signed-off-by: Erica Windisch <erica@windisch.us >
Upstream-commit: 88535f97330f278b1be2c736f74a88d6abc27ca6
Component: engine
2017-03-28 19:55:08 +00:00
ea10b30ed8
Merge pull request #32142 from vdemeester/integration-cli-package-2
...
[test-integration] Migrate some more tests to `cli` package
Upstream-commit: 78e0ad79533d8a9d092071e24dfb41894ad17756
Component: engine
2017-03-28 21:37:07 +02:00
9345697f56
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: aac861f3d9d0a38d9bcc4e11d56ef9648bb1f79e
Component: engine
2017-03-28 11:51:33 -07:00
82e98876ed
Add entrypoint flags to service cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d3ea30de1005fdf8fe95e9b0bc9fc5dae9b025b1
Component: engine
2017-03-28 11:24:19 -07:00
c36a683f9c
Merge pull request #32169 from thaJeztah/fix-non-swarm-prune
...
Fix docker system prune failing with Swarm mode disabled
Upstream-commit: c7c7f36da7fbdaaee97b21c9174872e32fa4e037
Component: engine
2017-03-28 14:07:25 -04:00
55ffbd6769
Delete extraneous H1 title
...
Signed-off-by: JimGalasyn <jim.galasyn@docker.com >
Upstream-commit: 8d0c05cfe46607482e1ca5e4b1d80de80b8e5d8f
Component: engine
2017-03-28 10:56:26 -07:00
be16a96868
Merge pull request #32176 from thaJeztah/add-albers-to-maintainers
...
Add Harald Albers to maintainers
Upstream-commit: d386f813e06e829f7b10720c233688af50e06540
Component: engine
2017-03-28 17:29:38 +02:00
d5813901f9
Merge pull request #32178 from thaJeztah/add-john-stephens-to-maintainers
...
Add John Stephens to maintainers
Upstream-commit: c19ba877e0e22f22e97987ce0195cd26790e0e06
Component: engine
2017-03-28 17:29:02 +02:00
7c499a34c1
Merge pull request #32177 from thaJeztah/add-evan-to-maintainers
...
add Evan Hazlett to maintainers
Upstream-commit: a5a0d752a13a9bf85ab055639e400bc32236ec8e
Component: engine
2017-03-28 17:28:30 +02:00
5e6682d71d
Add John Stephens to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cfbde0b422f4e6f97031b3a55ad9ce726b05be67
Component: engine
2017-03-28 16:46:37 +02:00
b50ba38ff0
add Evan Hazlett to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c7fedc2fd6d47c202e06bdae6ff205ad3d9e488
Component: engine
2017-03-28 16:39:56 +02:00
02d41bd050
Add Harald Albers to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5cd4e96cd537539b42f1339668c371537bf56e45
Component: engine
2017-03-28 16:38:23 +02:00
ba4d313c47
Fix docker system prune failing with Swarm mode disabled
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f2ed03092def6d3ccfbb05d9df8e1b5f2f78149
Component: engine
2017-03-28 16:35:24 +02:00
38224530f1
Add NetworkManager and ClusterStatus interfaces
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8f4f85dd5b5b6b7268428b8f95f56c1ba8608ac3
Component: engine
2017-03-28 16:35:14 +02:00
96699fb127
Merge pull request #30652 from rhatdan/selinux
...
If caller specifies label overrides, don't override security options
Upstream-commit: b6cb416051585f265530169346475b97ff9afd8d
Component: engine
2017-03-28 10:24:47 -04:00
dc3608e2ad
Fix issue #30201 – clean trust folder at the end of the test
...
This test doesn't clean the folder where it stores it's config (and
the trust folder), and thus, it fails if we run it more than
once (could also affect other tests at some point).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 16377f4d1667b9234c12be7991de6bd1c472c9a4
Component: engine
2017-03-28 16:12:41 +02:00
aedba1db46
Merge pull request #31683 from AkihiroSuda/it-on-swarm-easy-analysis
...
integration-cli-on-swarm: new CLI flag: -keep-executor
Upstream-commit: 917cb0d9d0cb97a954548b658c247ecbef664f10
Component: engine
2017-03-28 15:50:52 +02:00
de10a198b8
[test-integration] Migrate some more tests to cli package
...
Add some required command operators to the `cli` package, and update
some tests to use this package, in order to remove a few functions
from `docker_utils_test.go`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: eeaa6c96d83575da765dfc626c2c73d8a29dda32
Component: engine
2017-03-28 15:17:31 +02:00
2b108da4a1
Dockerd: enable CORS when only --api-cors-header is used
...
Even though the flag `--api-enable-cors` is deprecated in favor of
`--api-cors-header`. Using only `--api-cors-header` does not enable
CORS.
Make changes to 'cmd/dockerd/daemon.go' to enable cors if either of
the above flags is set.
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com >
Upstream-commit: f0f673f4d50ac072e4c7a236d2a318632c4fa89c
Component: engine
2017-03-28 18:09:14 +05:30
18d5857e95
Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
...
Updated push.md with progress bar info
Upstream-commit: a048e131beaa32330ce423259f33863f969b2533
Component: engine
2017-03-28 14:02:10 +02:00
c616d67251
Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
...
Update docs for experimental features
Upstream-commit: bd811aa4fde8632197c96ca3a7af039789768107
Component: engine
2017-03-28 14:01:05 +02:00
21cd677849
Merge pull request #31901 from davidxia/fix-docs
...
[docs] Fix incorrect `docker inspect` example
Upstream-commit: b385a9156ea56e8e8fe91576196761e17a509469
Component: engine
2017-03-28 14:00:05 +02:00
b8233dd3d5
Merge pull request #30810 from allencloud/make-secret-ls-support-filter
...
make secret ls support filters in CLI
Upstream-commit: 4df350b8c7a53dc82d8a6e187882faf8f90ce766
Component: engine
2017-03-28 13:43:19 +02:00
8cfb32ea06
Update docs for experimental features
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9fd27bf1a9a443de5f9f263d63af0ffbc2265dcb
Component: engine
2017-03-28 13:25:11 +02:00
585efde395
Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
...
Fix indenting in deprecated engine features toc
Upstream-commit: 0f8a3dafa4d8e1fb2afd8c1d67ded46db3e5da62
Component: engine
2017-03-28 13:09:47 +02:00
88ed1bfdd3
Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc
...
specify max size for secret in doc
Upstream-commit: 7c7cc0bbdc69ba7039b012dd0e73867bf2ab7699
Component: engine
2017-03-28 12:59:19 +02:00
798aa28677
Merge pull request #32112 from vdemeester/carry-ref-inspect-detail
...
Add details for inspect command usage
Upstream-commit: 54805701bd73d692fccd02c7c691fa293ab2e39a
Component: engine
2017-03-28 12:49:57 +02:00
d4390b9105
Add details for inspect command usage
...
Signed-off-by: Eric G. Noriega <egnoriega@users.noreply.github.com >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 59ef08c87836cab7540c07403a19ae5ea4eb85b9
Component: engine
2017-03-28 11:04:10 +02:00
3f0713bbb1
Add support for --type=secret in docker inspect
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 71129f6be6c143b8210636f8bbb11a7c86b42cb6
Component: engine
2017-03-28 10:48:48 +02:00
a904ff4596
Merge pull request #32156 from cpuguy83/index_copy_new_slice
...
Don't pass reference to mutable slice
Upstream-commit: 95510551cea4a1211070ecdc5f1319f5aa2c9a7c
Component: engine
2017-03-28 10:23:08 +02:00
a71cefb645
Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE
...
Windows: Revert change to wait for OOBE
Upstream-commit: 1c7a3d3e6c03e911775d8bed8675d5bc5dc1cfcd
Component: engine
2017-03-28 10:22:03 +02:00
3670f999ce
Merge pull request #30763 from ripcurld0/fix_30714
...
Fix the create API when fromSrc has a bad URL
Upstream-commit: 35e5975b9049f341f947c1bf281b06af45cb1a48
Component: engine
2017-03-28 10:20:59 +02:00
69182c0d50
Merge pull request #31709 from dnephin/better-errors
...
Replace fmt.Errorf() with errors.Errorf() in the cli
Upstream-commit: 99aaf6b9233d0a0a577e79f536288bca36794c50
Component: engine
2017-03-28 10:17:46 +02:00
69b0fc45bc
Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands
...
Add cli reference docs for root-level commands
Upstream-commit: cf113faca649fef70990677f0f4fd2b14e0af038
Component: engine
2017-03-28 09:46:32 +02:00
d247c210cb
Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename
...
Set the alias to the service name instead of the network name
Upstream-commit: 4155343f444c2fc6204447d0102a640425636e6c
Component: engine
2017-03-28 09:46:05 +02:00
7722df7d0b
specify max size for secret in doc
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5f8fcd9d63c055262da82306273034060a3bb306
Component: engine
2017-03-28 10:17:03 +08:00
37e3d52b2f
Do not replace fmt.Errorf in generated file
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0d088186536aa480eea92f55f33ee41f66cec1a3
Component: engine
2017-03-27 18:33:41 -07:00
80739547ec
Don't pass reference to mutable slice
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d5b7839008f80a82063869c43ee197a3b6781ca3
Component: engine
2017-03-27 21:23:06 -04:00
5f5b8fe9f6
Manually reorganize import paths to segregate stdlib and 3rd-party packages
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: febbe3879695c46d243ce806713038e0c1582806
Component: engine
2017-03-27 18:21:59 -07:00
753f67cb4f
Windows:Revert change to wait for OOBE
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6eed7f0cac10495c95a8e4b74548e707af933f8c
Component: engine
2017-03-27 14:32:18 -07:00
43cc695e6b
Merge pull request #32077 from zigarn/build-output
...
Display created tags on successful build
Upstream-commit: c5f178da05b27bda40c863b7d65ef8ef11eb1fbe
Component: engine
2017-03-27 12:41:13 -07:00
1c78b003d4
Update "man" of docker-run
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
Upstream-commit: 22f0b27f59aacd1f9028a8d2ea37e1ed6372675e
Component: engine
2017-03-28 02:50:57 +09:00
723b938620
Merge pull request #32107 from mkumatag/fix_api_doc
...
Fix Healthcheck API doc
Upstream-commit: abecc530ee28ca4accb295c83f762855732d2667
Component: engine
2017-03-27 18:45:48 +02:00
d37ed1a2fe
Merge pull request #32114 from sdurrheimer/zsh-completion-network-ls-scope-filter
...
Add zsh completion for 'docker network ls --filter scope'
Upstream-commit: ae811e9597475c7437ba3c14ed2a21d199bb6c77
Component: engine
2017-03-27 18:36:08 +02:00
ed513ca3d1
Merge pull request #32115 from sdurrheimer/zsh-completion-plugin
...
Add missing zsh completion for 'docker plugin ls'
Upstream-commit: b9c8d9c66085263ac239e9122af80e4c2bb0d6d0
Component: engine
2017-03-27 18:35:16 +02:00
eb6e0f0d03
Do not panic on redundant UpdateAttachment
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 3bf164e48df2b640545a64ddfcf274c60c042e39
Component: engine
2017-03-27 08:52:03 -07:00
3ee40f07d5
Merge pull request #30974 from erxian/add-new-cli-argument-squash-to-docker-build
...
add docs to describe experimental CLI argument --squash to docker build
Upstream-commit: 91f3f992f156bebb79d80f022c111943dea0f5b0
Component: engine
2017-03-27 17:09:54 +02:00
51025ebc27
Merge pull request #31714 from aboch/cingr
...
Allow user to replace ingress network
Upstream-commit: 04295d26df3034a9a92da8400418f843d7c48780
Component: engine
2017-03-27 07:30:42 -07:00
9d93e56a18
Merge pull request #32044 from jonisar/patch-1
...
Readme grammer fix
Upstream-commit: 1bb6a53e767f883cc58c716a477b27383b185833
Component: engine
2017-03-27 16:20:45 +02:00
333f4f4d72
Set the alias to the service name instead of the network name
...
This makes it work a little closer to compose part and it is more
correct 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ee08c8542aed078e06f1d9c559d62560e97f371d
Component: engine
2017-03-27 11:42:15 +02:00
Erica Windisch
Sebastiaan van Stijn
Dong Chen
Daniel Nephin
Brian Goff
JimGalasyn
Sebastiaan van Stijn
Vincent Demeester
Karthik Nayak
Misty Stanley-Jones
EG Noriega
allencloud
Tibor Vass
Darren Stahl
Tõnis Tiigi
mapk0y
Alessandro Boch
Madhu Venugopal