Commit Graph
37584 Commits
Author SHA1 Message Date
Slava Semushin cd16e5cc8b docs/reference/builder.md: mention that USER directive also allows to specify the user group.
Signed-off-by: Slava Semushin <semushin@redhat.com>
Upstream-commit: a84463d8d5
Component: cli
2017-06-14 15:49:37 +02:00
Vincent Demeester 26df7d0bfd Merge pull request #33640 from dsheets/pluginv2-static-start-but-disabled-error
plugin/store.Get: return a specific error if plugin is disabled
Upstream-commit: 397a57d3a5f057a3c787afa107964b692ec2ebe1
Component: engine
2017-06-14 15:35:26 +02:00
Vincent Demeester 4e0a36e808 Merge pull request #33053 from simonferquel/ignore-private-networks
Ignore HNS networks with type `Private`
Upstream-commit: 0c2f3bcd822b798de806be825fd65bbe36d66bd8
Component: engine
2017-06-14 14:20:39 +02:00
Wentao Zhang 18477cd2ed When daemon is in startup process, could not start container
Description:
 When docker is in startup process and containerd sends an "process exit" event to docker.
 If the container config '--restart=always', restartmanager will start this container very soon.

 But some initialization is not done, e.g. `daemon.netController`,when visit, docker would panic.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
Upstream-commit: 5b0993d6c778c18735692560538c790faa3dbbb4
Component: engine
2017-06-14 18:53:18 +08:00
Vincent Demeester 75f90c1a7c Merge pull request #33655 from dsheets/authz-disable-race
Eliminate authz plugin disable race
Upstream-commit: 11293d91f94418a454006ee93e88aed1861fcf27
Component: engine
2017-06-14 11:07:23 +02:00
Vincent Demeester 1319ac06c7 Merge pull request #187 from dnephin/small-cleanup-to-image-remove
Fix some problems with image force remove
Upstream-commit: d209929aab
Component: cli
2017-06-14 09:59:32 +02:00
Vincent Demeester 544efe0207 Merge pull request #115 from jsoref/spelling
Spelling
Upstream-commit: 4ffefe4a1f
Component: cli
2017-06-14 09:58:55 +02:00
Vincent Demeester f3827b078b Do not call the config endpoint if API is lower than 1.30
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2128b3f112
Component: cli
2017-06-14 09:56:53 +02:00
Brian Goff 9f19cc9a66 Merge pull request #33663 from vieux/report-2017-06-12
Moby Dev Report 2017 06 12
Upstream-commit: 7959c2e49d0f999c0d44e00febdbf390c0d3a944
Component: engine
2017-06-13 23:05:57 -05:00
Brian Goff 86f07ae89f Merge pull request #33665 from tiborvass/remove-docs
Remove docs (except docs/api), experimental/, contrib/completion, man/
Upstream-commit: 6d556df196d8dcf78e72e8bf0486f3f5156cfd73
Component: engine
2017-06-13 23:04:25 -05:00
Brian Goff 0f674e20a2 Merge pull request #189 from tiborvass/update-docs
Update docs, completion, man
Upstream-commit: 3be666387a
Component: cli
2017-06-13 23:04:09 -05:00
Tibor Vass 42c5a6e86e Remove docs (except docs/api), experimental/, contrib/completion, man/
They have been moved to github.com/docker/cli.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b5579a4ce33af4c1f67118e11b5a01008a36d26a
Component: engine
2017-06-14 03:14:46 +00:00
Sebastiaan van Stijn 2f5b714872 Update docs, completion scripts for disable-legacy-registry
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2b8f0eef7338f37104464154ba65aef7db3b9703)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ee1bbab620
Component: cli
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn 786d489f99 Merge pull request #33572 from hsluoyz/patch-1
Add Casbin plugin to the list of Authorization plugins in docs.
(cherry picked from commit 220831d541bfe9bf566c1038773198d431560dd3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad3e3294e74f443130b5e1fb1ef6b31f4f92366)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8b11d46ecd
Component: cli
2017-06-14 02:48:46 +00:00
Doug Davis 9a66d3e2b0 Merge pull request #32804 from bbodenmiller/patch-1
remove extra word
(cherry picked from commit 9db03bd8cdad3c8804105cb5794ebad5e728f48f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3eaec0071c3ce1b7201e37859afe5bcb78d4f215)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ba4dcadcaa
Component: cli
2017-06-14 02:48:46 +00:00
Brian Goff 090c6ccf05 Merge pull request #32791 from djalal/patch-1
fix typo
(cherry picked from commit 32a52716b964373b4ac464052e73ea5da79856c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fcbd93f52032593cc71b298c00a46fd354356650)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8247a36058
Component: cli
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn 13d31e4cd8 Merge pull request #32735 from bhavin192/patch-1
Add note about host-dir in VOLUME
(cherry picked from commit f2fff9d913a8ab0436dd56033189a7c3713a59a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8fd6547fc3eb67e7efa7efb007ae6a4494cd2bb3)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5bf86c1984
Component: cli
2017-06-14 02:48:46 +00:00
Vincent Demeester fc9f540d08 Merge pull request #32724 from PatrickLang/patricklang-win-memory
Adding more on -m and --memory
(cherry picked from commit c3fbca106552f2dadcb89510ff87945b50f36419)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b4047a849bd3018f8a8eabf34613a4fca57f818e)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b1738f4505
Component: cli
2017-06-14 02:48:46 +00:00
Tõnis Tiigi a08039c09b Merge pull request #32684 from scjane/patch-3
Update builder.md
(cherry picked from commit 831066337743fc29ff122fce51afe44b8b3b3ba9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bc66821abbcf50c721ce9b8f52b339fda102d389)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7955683eb2
Component: cli
2017-06-14 02:48:46 +00:00
Sebastiaan van Stijn d17a741bef Update deprecated.md for removal of --email flag
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 43239f62bedc4721d27744d21c122622988bb3ae)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6ee8cf85c5
Component: cli
2017-06-14 02:48:46 +00:00
Victor Vieux ce3a475d7a Moby June 12th dev report
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b9dfa9ab753c6239905b4cc506d84dba458800a1
Component: engine
2017-06-13 19:02:26 -07:00
Darren Stahl 1b032e855d Skip evaluation of symlinks to data root on IoT Core
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8e71b1e210dc0eff980f39271d6c1dd48d87024e
Component: engine
2017-06-13 15:02:35 -07:00
Aaron Lehmann 774e3b7a1d Merge pull request #72 from thaJeztah/fix-prefix-matching
Fix prefix-matching for service ps
Upstream-commit: 275c488734
Component: cli
2017-06-13 14:59:37 -07:00
Aaron Lehmann 809225a7dc Merge pull request #184 from yongtang/167-network-inspect-scope
Use scope=swarm for service related network inspect and revendor docker/docker
Upstream-commit: 25bc9f1ce7
Component: cli
2017-06-13 14:47:20 -07:00
Yong Tang a55a518566 Use scope=swarm for service related network inspect.
This fix use `scope=swarm` for service related network inspect.
The purpose is that, in case multiple networks with the same
name exist in different scopes, it is still possible to obtain
the network for services.

This fix is related to moby/moby#33630 and docker/cli#167

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 657457ee2c
Component: cli
2017-06-13 20:26:12 +00:00
Daniel Nephin 8af6b6b3cd Fix some problems with image remove force.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 676b71eaaa
Component: cli
2017-06-13 12:12:54 -07:00
Sebastiaan van Stijn 65df45f31c Merge pull request #186 from adshmh/fix-output-leak-from-config-remove-test-case
fix the output leak from error test case for config/remove
Upstream-commit: 7baaa90481
Component: cli
2017-06-13 21:04:47 +02:00
Victor Vieux d6e9a073bf Merge pull request #33518 from naveed-jamil-tenpearls/pkg/sysinfo
Increased Unit Test Coverage for PKG/SYSINFO
Upstream-commit: 9c446a4d0061014390e938d01941aab976c38d11
Component: engine
2017-06-13 10:57:49 -07:00
Arash Deshmeh 45b64dbaab fixed the output leak from error test case for config/remove
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 006b9b126d
Component: cli
2017-06-13 12:24:42 -04:00
David Sheets 142f748495 authz: remove and hide unused and local-only methods respectively
Signed-off-by: David Sheets <dsheets@docker.com>
Upstream-commit: 24264697c54843ea8dbd30ac37652409943e7bf4
Component: engine
2017-06-13 13:51:11 +01:00
David Sheets 8857822260 authz: eliminate race during plugin removal from middleware
Also, this removes the use of a questionable golang range feature which
corrects for mutation of a slice during iteration over that slice. This
makes the filter operation easier to read and reason about.

Signed-off-by: David Sheets <dsheets@docker.com>
Upstream-commit: 7da3986297e04b419ce08b19766633dba36b7d30
Component: engine
2017-06-13 13:51:07 +01:00
Brian Goff c03bd3f5e9 Merge pull request #32468 from coolljt0725/clean_thin
devicemapper: remove thin pool if 'initDevmapper' failed
Upstream-commit: bccebdac1806d39848c6b51e9fea757e77bc2dad
Component: engine
2017-06-13 07:34:15 -05:00
Sebastiaan van Stijn da632307b9 Make TestServiceCreateCompatiblePlatforms use actual API response
The `TestServiceCreateCompatiblePlatforms()` test was confusing, because it
did not actually use the mocked API response, but used a local
`distributionInspectBody` variable to verify that the `/distribution/` endpoint
was called.

This flow was especially confusing, because a comment in the test describes;

    "check if the /distribution endpoint returned correct output"

If (for whatever reason), the endpoint was not called, the test would panic,
because the `distributionInspectBody` would not be set.

This patch rewrites the test to use the actual API response that is returned
by the mock, and verifies that the information returned by the `/distribution/`
endpoint is properly used in the service's definition.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f3fce00ef3f3b7ead5ac211f9aafabfebf820c2f
Component: engine
2017-06-13 14:25:50 +02:00
Vincent Demeester 9a1d721392 Merge pull request #185 from vdemeester/fix-image-remove-tests
Fix remove_test output duplication
Upstream-commit: feeeb2c550
Component: cli
2017-06-13 14:21:32 +02:00
Sebastiaan van Stijn 25eae686e2 Merge pull request #33621 from thaJeztah/fix-runc-version-exec
Fix missing "--version" argument
Upstream-commit: 5052986afc43788ce96604ea5aa2e441a11b1a89
Component: engine
2017-06-13 14:18:17 +02:00
Vincent Demeester 59b1e60ea5 Fix remove_test output duplication
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dd924ebf4f
Component: cli
2017-06-13 14:02:56 +02:00
Vincent Demeester f30d636fb1 Merge pull request #160 from e11137/master
fixes #46 Always exit 0 when remove image with force option
Upstream-commit: ecc8e0a204
Component: cli
2017-06-13 14:02:02 +02:00
Vincent Demeester a10bff4186 Merge pull request #32088 from simonferquel/windows-dockerignore-fix
Fix behavior of absolute paths in .dockerignore
Upstream-commit: c21c17c64260f474824d9591a4c026a7a01e66e5
Component: engine
2017-06-13 13:36:39 +02:00
Simon Ferquel b7238aa6a5 Ignore HNS networks with type Private
Fix #33052 (workaround style)

**- What I did**

HNS reports networks that don't have anything to do with the Daemon, and
for which no networking plugin is available. This make the Daemon start
sequence pause for 15 secs, as the plugin resolving logic has a wait &
retry logic

**- How I did it**

Just after retrieving the HNS networks, I filter out those with type
`Private`

**- How to verify it**

Replace dockerd coming with Docker for Windows from one built from this
PR. Windows containers daemon should now launch pretty quickly

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
Upstream-commit: b91fd26bb57c94a7ea7f77e5e548233506b78d21
Component: engine
2017-06-13 13:25:00 +02:00
Naveed Jamil 101aa410f3 Added Test Case Coverage for PKG/PROMISE
Signed-off-by: Naveed Jamil <naveed.jamil@tenpearls.com>
Upstream-commit: cffa6d52a2819c126517333b8b31337ded5cc0d9
Component: engine
2017-06-13 15:17:40 +05:00
Sebastiaan van Stijn 7195930562 Merge pull request #33645 from thaJeztah/disable-auto-milestone
Disable auto-assigning PR's to milestones
Upstream-commit: e22656bf2d855157f91cc7391f963b19c9e4aec0
Component: engine
2017-06-13 11:13:08 +02:00
Vincent Demeester 88669e2de2 Merge pull request #33571 from thaJeztah/client-api-version-checks
Add API version checks to client
Upstream-commit: ae487e543c2916bec05dc01ebd364a9d3b88595d
Component: engine
2017-06-13 10:50:05 +02:00
Yong Tang 04d4acede5 Update docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
This fix updates docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2

This fix is related to moby/moby#33630 and docker/cli#167

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8c2f81892b
Component: cli
2017-06-13 02:53:25 +00:00
Tonis Tiigi 2a61337b11 Add builder dev report for 2017-06-12
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 810015c5ff04fae45b12bb0a61709aaa4e7f7e41
Component: engine
2017-06-12 19:07:06 -07:00
Sebastiaan van Stijn e90e6dfee2 Disable auto-assigning PR's to milestones
Moby and Docker are separate projects, so
don't assign docker milestones to pull requests
in this repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e481509c746bb53c93b11c349f42ed2549ab728c
Component: engine
2017-06-13 03:32:48 +02:00
Aaron Lehmann b687d7ca5a Merge pull request #33630 from yongtang/167-cli-network-inspect-scope
Add `scope` filter in `GET /networks/(id or name)`
Upstream-commit: 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
Component: engine
2017-06-12 18:27:24 -07:00
Sebastiaan van Stijn 4356e0cf8e Merge pull request #33374 from raja-sami-10p/pkg/plugins
Increase the Coverage of pkg/plugins
Upstream-commit: 8183b9d12c786b4f7a844d0966df7acb1e78ff1d
Component: engine
2017-06-13 02:50:54 +02:00
Victor Vieux 0163e7d47c Merge pull request #33642 from aaronlehmann/vendor-swarmkit-a4bf013
Vendor swarmkit a4bf013
Upstream-commit: 3029e4b73c6d271098334daabd8272bdb14acf1b
Component: engine
2017-06-12 17:41:31 -07:00
Tibor Vass 10e0cc84e6 Merge pull request #157 from dnephin/make-compose-check-fail
Fix check-git-diff in CI
Upstream-commit: 8545341709
Component: cli
2017-06-12 17:15:35 -07:00
Brian Goff f0d519137d Merge pull request #33638 from coolljt0725/mnt_deatch
Use lazy umount on Put for overlay2 and overlay
Upstream-commit: ff2127968dd77be6a0d5d36e28a3ef465a143e15
Component: engine
2017-06-12 18:58:55 -05:00