Commit Graph
19381 Commits
Author SHA1 Message Date
Steve Durrheimer e49a07f95b Add zsh completion for '--cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ae31aa10abae62f95443ca610b0bae2662973776
Component: engine
2015-10-10 16:42:01 +02:00
Vincent Demeester d51f6045c8 Merge pull request #16846 from HuKeping/master
Use checkers on Integration test when possible
Upstream-commit: d46fff7d8f21c2c82a48772e8f5cbeab5d2583e6
Component: engine
2015-10-10 16:35:17 +02:00
Hu Keping d58c684b1c Use checkers on Integration test when possible
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 72269acf296ca3aac0ee637724baf75766ab4175
Component: engine
2015-10-10 21:51:15 +08:00
Doug Davis f800251e5f Add useful info to builder cache logrus.Debug
Closes: #16790

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 4920d4009330365babd228e6c27e317a672edc87
Component: engine
2015-10-10 05:53:06 -07:00
Vincent Demeester 47d7f02c89 Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
update save-load-unix-test
Upstream-commit: faa448e801ffb09eb83582d3203cc9fb0eb3cbde
Component: engine
2015-10-10 14:51:18 +02:00
Zhang Kun 9375e8c909 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08:00
Sebastiaan van Stijn be4b863cca Merge pull request #16895 from vdemeester/ocd-validate-typo
Fix few comments in validate scripts
Upstream-commit: a6bbf16aa1f8246f6979eaebf213e549e75b7b90
Component: engine
2015-10-10 12:08:37 +02:00
Sebastiaan van Stijn b322914fe9 Merge pull request #16899 from jfrazelle/provide-dates
fix depreciation dates
Upstream-commit: 5f2e0864e41d5fa417116a6f6d157c245f4d11e3
Component: engine
2015-10-10 12:06:34 +02:00
Vincent Demeester 89cc0cc0cb Merge pull request #16874 from ZJU-SEL/fix-parse-run-volumes
fix the error msg of func TestParseRunVolumes
Upstream-commit: 99c247a46a1827a3460e62b718af334f2847f5e6
Component: engine
2015-10-10 11:27:08 +02:00
Vincent Demeester ec720a54c6 Fix few comments in validate scripts
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1ce9be346b0d4df3b9b4fdf521b1cbb9cb111fc0
Component: engine
2015-10-10 11:21:04 +02:00
Viktor Stanchev c06269ae99 fix fish completion; wrong image names bug; close #16672
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: 4d746658cced59cdbcc2e045d8ed931f782ef1dd
Component: engine
2015-10-10 00:55:09 -07:00
xlgao-zju 7e7a22b183 update save-load-unix-test
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: 8d98b370317d196e958f295d74bc37e596e1913a
Component: engine
2015-10-10 15:16:42 +08:00
xlgao-zju a670fb3535 fix the error msg of func TestParseRunVolumes
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: 8363f2f171952682ff872417bca727abc54577ac
Component: engine
2015-10-10 14:56:50 +08:00
Jessica Frazelle 2000bb0d9e fix depreciation dates
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 26701e2d9fc9e45f39b091351088b6b9a9f019d5
Component: engine
2015-10-09 20:24:04 -07:00
Phil Estes 171ab4083f Merge pull request #16894 from diogomonica/renaming-trust-keys
Renaming trust keys
Upstream-commit: bf80adeee49e78e181007ff6790bf1ff2b22a72e
Component: engine
2015-10-09 23:20:54 -04:00
Jess Frazelle da342b53ce Merge pull request #16788 from stefanberger/apparmor_policy_1.9
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
Upstream-commit: e5f7fdccfba05fa3d72374b31497e73a46c60471
Component: engine
2015-10-09 20:15:06 -07:00
Jessica Frazelle 9b28670308 fix logic because jess is the worst
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 930b27a86bf02969600259ce3a5d3fcff10edcb5
Component: engine
2015-10-09 22:21:24 -04:00
Phil Estes e36eec68dc Update integration test userns support with flag name change
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: a85e6a4d4a5afc866b153e46e19ed3c15d3a24ec
Component: engine
2015-10-09 20:52:45 -04:00
Jessica Frazelle 29fa44dc8c add test-integration-cli specifics for userns
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ea3afdad612448fc6eefcc4bdd63563be8f16946
Component: engine
2015-10-09 20:50:27 -04:00
Phil Estes 1efd61d215 Add user namespace enable flag --userns-remap in experimental build
This adds the capability to turn on user namespace support when using an
experimental build Docker daemon binary using the `--userns-remap` flag.

Also documentation is added to the experimental docs.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 44e1023a93a0107d63d5400695cbbc6da498a425
Component: engine
2015-10-09 20:50:05 -04:00
Sven Dowideit 4e6b402919 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
2015-10-09 17:48:03 -07:00
Diogo Monica f27c37e60e Changing docs to reflect new names
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: d9a2fadb5e26cb0e8e79c260b74236a16d9a9e33
Component: engine
2015-10-09 15:13:37 -07:00
Vincent Demeester c62932e901 Merge pull request #16858 from cxxly/16756-refactor-docker_cli_login_test
refactor integration-cli/docker_cli_login_test.go with Assert
Upstream-commit: 1e5165275fcac2077240a22a053329c237f3695b
Component: engine
2015-10-09 23:56:24 +02:00
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
Morgan Bauer 8d04ef47a0 refactor away direct references to daemon member
- add daemon methods Authenticate & SearchRegistryForImages
 - use new methods instead of directly accessing RegistryService

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 215bfc73d2f162e2c4fdc306923de8ca4788d389
Component: engine
2015-10-09 14:40:03 -07: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
Diogo Monica 1dd074a72b Adding tests for backwards compatibility
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: 63f8db83aab9f79236df67c0be2c901f7e1b7c23
Component: engine
2015-10-09 12:20:19 -07:00
Diogo Monica 596fe0bbd1 Changed trust ENV variables while still supporting old ones
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: 52240c2d62508e08cddcce42f04e45855750b381
Component: engine
2015-10-09 12:19:43 -07: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