Commit Graph
18844 Commits
Author SHA1 Message Date
Phil Estes 93c2a19d83 Add user namespace (mapping) support to the Docker engine
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.

Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 442b45628ee12ebd8e8bd08497896d5fa8eec4bd
Component: engine
2015-10-09 17:47:37 -04:00
Phil Estes 68f404261e Add utility/support package for user namespace support
The `pkg/idtools` package supports the creation of user(s) for
retrieving /etc/sub{u,g}id ranges and creation of the UID/GID mappings
provided to clone() to add support for user namespaces in Docker.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9a3ab0358ecd657e3754677ff52250fd6cca4422
Component: engine
2015-10-09 17:44:47 -04:00
Brian Goff 92b8b3f4bb Merge pull request #16709 from MHBauer/daemon-derepo2
continue daemon refactor of Repositories()
Upstream-commit: 7787d6dc2882def6bc125395c924827d30bd8a03
Component: engine
2015-10-09 15:35:21 -04:00
Phil Estes 78919318b0 Merge pull request #16868 from cpuguy83/speedup_graph_unittests
Do not probe plugins for graph init unless `-s`
Upstream-commit: f112cd6b6ec4473aade29f7e86debb531d39e900
Component: engine
2015-10-09 15:31:09 -04:00
Sebastiaan van Stijn 6d8620acc6 Merge pull request #16604 from mountkin/add-missing-commit-parameters
add missing parameters of the commit API to the docs
Upstream-commit: dbc20693f7bc6ce9bc1da3f6c4c0cd725e0454c1
Component: engine
2015-10-09 20:55:54 +02:00
Sebastiaan van Stijn cd3d877718 Merge pull request #16722 from sallyom/man-docker-build-fix
add clarity in man/docker-build
Upstream-commit: 5099255d873f77da5677096ea5d3828ee807fbde
Component: engine
2015-10-09 20:53:28 +02:00
Sally O'Malley d2f0ae2d1f add clarity/fix typos man/docker-build
add needed clarity for
1)  using STDIN to pass build context
2)  --cpu-shares flag use

also a few typos

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: a2bc804936e35b4568764352aa4f1435bc35e050
Component: engine
2015-10-09 13:57:13 -04:00
Alexander Morozov ddc5f041c8 Merge pull request #16867 from dmcgowan/distribution-upstream-name-change
Update distribution package for name regexp change
Upstream-commit: 90e733f0b1ca570657cee2222b0ad1775d096619
Component: engine
2015-10-09 10:09:23 -07:00
Alexander Morozov 1214abd05f Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test
Use Assert statement to replace condition judgment
Upstream-commit: 2491f6c95a5c893e8ffe18a9b3d6982b2cfc4bcd
Component: engine
2015-10-09 09:57:14 -07:00
Alexander Morozov a680c1ca97 Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test
update integration-cli/docker_cli_stats_test.go use Assert statement
Upstream-commit: a77d80d9d1ac7e807e12004707ce4b6907873fec
Component: engine
2015-10-09 09:55:41 -07:00
Alexander Morozov 794f914972 Merge pull request #16882 from albers/completion--cluster-store-opt
Add bash completion for `--cluster-store-opt` (#16644)
Upstream-commit: dc04675f4aabdd5255047e1831c1434801e94317
Component: engine
2015-10-09 09:53:56 -07:00
moxiegirl 1863ad7ae9 Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
man update for docker run with host volumes
Upstream-commit: 26ee5fea02c7e7d09addc13275a0a44d2f608a4c
Component: engine
2015-10-09 09:24:11 -07:00
Brian Goff e0d971daa6 Do not probe plugins for graph init unless -s
When `-s` is not specified, there is no need to ask if there is a plugin
with the specified name.

This speeds up unit tests dramatically since they don't need to wait the
timeout period for each call to `graphdriver.New`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3b16cb15b496edc3dc080560c7189e06e19c5343
Component: engine
2015-10-09 12:02:54 -04:00
Brian Goff a2b541bbcc Merge pull request #16875 from hqhq/hq_quiet_at_info
Keep daemon quiet when using docker info
Upstream-commit: 96e1cda40f15a721c0c986ecee9c0543139c3312
Component: engine
2015-10-09 11:26:53 -04:00
Phil Estes 3b6afa7db5 Merge pull request #16843 from ZJU-SEL/16756-fix-rename-test
#16756 update rename test
Upstream-commit: c2df663851250d85d659d104b1a3380607249919
Component: engine
2015-10-09 11:23:46 -04:00
Shijiang Wei 7318a696ed add missing parameters of the commit API to the docs
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: b69f4f3c1366385468e140613aedfc41038a4b35
Component: engine
2015-10-09 23:21:12 +08:00
Vincent Demeester 7d67d2acff Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test
refactor docker_cli_proxy_test.go
Upstream-commit: 19ff8e09ba76cd0cabef8e5e87e4c999d7baf2d3
Component: engine
2015-10-09 15:43:39 +02:00
Sebastiaan van Stijn 629317774a Merge pull request #16108 from charleswhchan/patch-2
Touch up Node.js and MongoDB examples
Upstream-commit: 3526993b2f2a490f29f291677d765face43a7bc7
Component: engine
2015-10-09 15:33:30 +02:00
moxiegirl ccb8fd3e79 Merge pull request #16876 from luca3m/patch-1
Sync with remote API
Upstream-commit: 06146b333cb18dd3997e9c3632d79771ba79145c
Component: engine
2015-10-09 06:30:02 -07:00
moxiegirl c902cdd516 Merge pull request #16833 from sunyuan3/cpu-shares
Add description for "--cpu-shares=0".
Upstream-commit: 734c9d2f67ada2dcc26a5a9b23f9fd5de0421c1f
Component: engine
2015-10-09 06:29:18 -07:00
moxiegirl 0de3aef69d Merge pull request #15903 from charleswhchan/patch-1
Revise documentation for Docker LABEL.
Upstream-commit: b7083cf08bc37e52cf7c49ce4f7d42f30576dbd0
Component: engine
2015-10-09 06:11:50 -07:00
Hao Zhang 85749dbc68 use gocheck asserts instead of fatal
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
Upstream-commit: 22d0be5797fd5561c999e08701e64258ff9d9536
Component: engine
2015-10-09 08:34:02 -04:00
Harald Albers 109ae801cf Add bash completion for --cluster-store-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a095f82877cd3ab7e49526715259a86b47c996f4
Component: engine
2015-10-09 14:00:52 +02:00
Luca Marturana 2a3da85fc7 Sync with remote API
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Upstream-commit: d7ca0a48ac827c394f406787d1b28301da3c9a13
Component: engine
2015-10-09 13:53:51 +02:00
Vincent Demeester 02def67edb Merge pull request #16879 from x1022as/network
remove useless function generateIfaceName()
Upstream-commit: 04e883c22bdde4eee06baf2178222ebf3447f9f1
Component: engine
2015-10-09 13:25:03 +02:00
Xiaoxu Chen 0ead9a0735 update integration-cli/docker_cli_stats_test.go use Assert statement
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 90a81f6af256b93bf61d56ff06b84828d4d05b7a
Component: engine
2015-10-09 18:24:32 +08:00
Deng Guangxing 950bd09f8a remove useless function generateIfaceName()
generateIfaceName() is useless as libnetwork has done
the job.

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: a1620084c52a1afee55e9eabd7faa30889c8cabc
Component: engine
2015-10-09 18:07:54 +08:00
Xiaoxu Chen 97dbafb510 Use Assert statement to replace condition judgment
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: ee7fdbe8b9ff6ed48d183d2160c4ad5a2d713261
Component: engine
2015-10-09 17:45:28 +08:00
Qiang Huang 0b478891af Keep daemon quiet when using docker info
If I have some unsupported sysinfo, it's warning on daemon
side every time I use `docker info`, it seems unnecessay and
annoying to me, let's keep it quiet.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aaacde4fd24c22b02312793acda75ee987601727
Component: engine
2015-10-09 14:57:47 +08:00
Xiaoxu Chen e67d897bad update docker_cli_proxy_test.go
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 1db161768ccfc67d36034f06db36451b6cc6a214
Component: engine
2015-10-09 14:53:56 +08:00
Charles Chan 774ab0f6af Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: c7e0531c3ab1844423e64ef49619faa24471f2e3
Component: engine
2015-10-08 20:47:09 -07:00
Xiaoxu Chen c402376705 refactor docker_cli_proxy_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 14f43406a38b1f66ab60b5235bde4b0121eed093
Component: engine
2015-10-09 11:11:05 +08:00
Arnaud Porterie 824a6e360c Merge pull request #16862 from cpuguy83/bump_runc
Bump runc
Upstream-commit: e7ef8633d5b098d930a6670fb0217061e1a75755
Component: engine
2015-10-08 19:09:47 -07:00
Jess Frazelle 74340a2f1e Merge pull request #16859 from diogomonica/changing-trust-server-checks
Changing trustServer allowed URL validation
Upstream-commit: a1d432301d08f6fbf4da792c0b35a67cfdbc770e
Component: engine
2015-10-08 18:33:35 -07:00
Jess Frazelle 183b647fc0 Merge pull request #16866 from cpuguy83/fix_exp_graphdriver_error
Fix exp tests cast protodriver to naivediffdriver
Upstream-commit: 103189e56205d09bc9cfdf77232fac12a5cc8483
Component: engine
2015-10-08 18:01:48 -07:00
Diogo Monica 5d84a009ca Changing trustServer allowed URL behavior
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: a2f9fb7777ab4ff90747a1fe67dda9046686acad
Component: engine
2015-10-08 17:47:25 -07:00
Derek McGowan 505ac314c6 Update distribution package
Pick up name regexp change in distribution to allow matching of hostnames as a valid component of a repository.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: b5b0da5fec235df864f5d84292b277aee80e5e3a
Component: engine
2015-10-08 17:16:43 -07:00
Brian Goff caa88a80a6 Fix exp tests cast protodriver to naivediffdriver
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.

The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a705ca017349b9d4c71e22de795e7dda40a5ecce
Component: engine
2015-10-08 19:44:50 -04:00
Michael Crosby 6ec1436aba Merge pull request #16152 from chlunde/devmapper-mount-flags
Use pkg/mount to support more flags in dm.mountopt
Upstream-commit: 6d9a84bcd04cd178033309859eb7bf386a8db85d
Component: engine
2015-10-08 16:02:50 -07:00
Sebastiaan van Stijn f8f0e2ad59 Merge pull request #16861 from moxiegirl/fix-testing-stuff
Removing the tests. 
Upstream-commit: bccf5c756b1aa80832ff6ca54ff539b71ab73faa
Component: engine
2015-10-09 00:46:02 +02:00
Mary Anthony f583b724cf Removing the tests. We have training site now.
Ugh...actually adding the files to delete

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5a94d2b5b9dc0d09d8113396f26d1757142c0661
Component: engine
2015-10-08 15:22:59 -07:00
Morgan Bauer abbfb24add continue daemon refactor of Repositories()
- use daemon member directly rather than through a function call
 - create GetImage method for use external to deamon

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: ee36b57c8f3c33f1c50ecb4305bd62a962876fe6
Component: engine
2015-10-08 15:06:55 -07:00
Jess Frazelle 2c93131473 Merge pull request #16644 from dhiltgen/discovery_tls
Add TLS support for discovery backend
Upstream-commit: b50a88cfd78498e5cd943ee3964585a73067e3e4
Component: engine
2015-10-08 14:21:06 -07:00
Jess Frazelle a78c0b3db5 Merge pull request #16638 from MHBauer/daemon-derepo
refactor daemon image tagging
Upstream-commit: 67e38cc54cf528206aa150b05680748943764df8
Component: engine
2015-10-08 14:14:20 -07:00
Brian Goff c33d0611cf Merge pull request #16643 from chenchun/fix_empty_repository
Do not try to cleanupMounts if daemon.repository is empty
Upstream-commit: 4ab8514387286598504e05678d7bde9a5df00f45
Component: engine
2015-10-08 17:10:49 -04:00
Brian Goff 59099af0ea Bump runc
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d9f5f1954cf3ba9c1f9644d7997033d5d62ab34b
Component: engine
2015-10-08 17:07:00 -04:00
Jess Frazelle 510810895d Merge pull request #16366 from MHBauer/logs-refactor
refactor logs to not use internal data structures
Upstream-commit: 01cd67e752aa8a2a7fa9605d5c53bc95862a4d7b
Component: engine
2015-10-08 14:05:02 -07:00
Jess Frazelle aa4d367db2 Merge pull request #16803 from tiborvass/pkg-broadcaster
Move types from progressreader and broadcastwriter to broadcaster
Upstream-commit: bea2257f926ad8e49973d695254669c159987d19
Component: engine
2015-10-08 13:51:08 -07:00
Jess Frazelle 57e2d9f131 Merge pull request #13777 from cpuguy83/graphdriver_extpoints
Create extpoint for graphdrivers
Upstream-commit: 4c55464dd3fbbecb0e67f9b33c54f62f3982b500
Component: engine
2015-10-08 13:46:42 -07:00
Brian Goff afbcd19418 Merge pull request #16660 from Microsoft/js/hostname
Windows: --hostname support
Upstream-commit: 5ec323aaa298dfa3f60bb28a638df65e7ade8624
Component: engine
2015-10-08 16:11:49 -04:00