Commit Graph

20987 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 5805d2d5d6 Move Erik to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fae00ad445cd6071e86d3372a6056d98dcdb9f6c
Component: engine
2015-12-23 18:01:02 +01:00
Sebastiaan van Stijn 73ee680a1d Merge pull request #18874 from duglin/falseDocs
remove =false from options that default to false in the docs
Upstream-commit: 8022d1159d472f0a54957d4e8cc2f39a0856f088
Component: engine
2015-12-23 16:34:44 +01:00
Doug Davis 743bbc7202 remove =false from options that default to false in the docs
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e6115a6c1c02768898b0a47e550e6c67b433c436
Component: engine
2015-12-23 07:11:35 -08:00
Sebastiaan van Stijn 58f7d0c31d Merge pull request #17782 from WeiZhang555/network-ls-nopre
Add filter for `network ls` to hide predefined network
Upstream-commit: 4432a8982188f5f3ccad753860b12bf0e516c4e9
Component: engine
2015-12-23 13:59:17 +01:00
Zhang Wei 6f10e6b229 Add filter for network ls to hide predefined net
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
Daniel Nephin 0c8c982991 Remove unused parser functions that were replaced by go-connections/nat.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b8659da2147293b6ecb49e05927ddbc6ef6b8cc4
Component: engine
2015-12-22 19:06:49 -05:00
David Calavera 382aba32a8 Make docker load to output json when the response content type is json.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fd2c0feb0c131d01d727d50baa7183b976c7bdc
Component: engine
2015-12-22 19:00:27 -05:00
Daniel Nephin 85924c9d77 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c
Component: engine
2015-12-22 18:59:47 -05:00
Daniel Nephin d319ce34b8 Move runconfig blkiodev options and parsing into runconfig/opts package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f015c29193c1afefff907ed65cbfb876e36263fa
Component: engine
2015-12-22 18:20:21 -05:00
Sebastiaan van Stijn f88ae3fe07 Merge pull request #18860 from dnephin/remove_migrate_if_downlevel
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
Upstream-commit: 1105caa7f10ae1fa775670256fa7d4ca9d44e4dd
Component: engine
2015-12-23 00:08:36 +01:00
David Calavera 13048f0ce1 Merge pull request #18831 from calavera/test_event_observer
Extract event processing to a common function for testing.
Upstream-commit: eacedcbe21e15f396ea1d9f620047718cce03df7
Component: engine
2015-12-22 15:04:32 -08:00
Sebastiaan van Stijn 6fc9c2e476 Merge pull request #18757 from thaJeztah/patch-release-process
Document process for patch-releases
Upstream-commit: 45033c0bdee09d63c6f92de6d71028a5b0a152d2
Component: engine
2015-12-22 23:42:34 +01:00
Arnaud Porterie 8bcec320d6 Merge pull request #18858 from thaJeztah/adieu-vieux
Move Victor to alumni
Upstream-commit: 319d488e6e66112ddf0f14072591fe0bf4461ec3
Component: engine
2015-12-22 14:38:54 -08:00
Alexander Morozov 143c9b690b Merge pull request #18762 from calavera/runconfig_to_types
Move container configuration types to api/types/container.
Upstream-commit: 030347c3c9505fa80eed0ecfde5d1e9af05c3cbc
Component: engine
2015-12-22 14:22:08 -08:00
David Calavera dadaf8ff90 Extract event processing to a common function for testing.
We keep only one logic to test event related behavior that will help us
diagnose flacky event errors.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: af51df20bdd9962b1aaa79819cafefc715290d28
Component: engine
2015-12-22 17:10:06 -05:00
Daniel Nephin b064975176 Remove migrateIfDownlevel and aufs migration from docker pre-0.7
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0673361ef6a0439b79239efb000574ae991b84f7
Component: engine
2015-12-22 16:45:42 -05:00
Alexander Morozov a9fe9a6c5b Merge pull request #18857 from calavera/catch_pipeline_error
Catch command pipeline error.
Upstream-commit: 9f228b37fc1108bee544973841513ffd0d06035c
Component: engine
2015-12-22 13:34:56 -08:00
Jana Radhakrishnan 663db95ac5 libnetwork vendoring
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
Tianon Gravi db95b6f873 Merge pull request #18856 from albers/completion-network-rm
remove `--format` from bash completion for `docker network rm`
Upstream-commit: 0bbed98bc0f4456f8e2be8e91e978dd167113678
Component: engine
2015-12-22 12:38:11 -08:00
Alexander Morozov 8e30598fab Merge pull request #18855 from rhatdan/volume-tmpfs
No options to tmpfs is valid
Upstream-commit: 9c89e83ff1b8d6598b487bebbbc29cef58840cc0
Component: engine
2015-12-22 12:24:51 -08:00
David Calavera 608da884be Catch command pipeline error.
Rather than ignoring errors in the pipeline, return an execution error
and do not proceed with the latest command in the pipeline.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f38257308b12ecf6de7ce72895a6430d6a3dc775
Component: engine
2015-12-22 15:17:15 -05:00
Harald Albers d09f09929b remove --format from bash completion for docker network rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f03695efc100a8f35e73bf51fc694e370e019d25
Component: engine
2015-12-22 11:35:41 -08:00
Dan Walsh 47e00eae65 No options to tmpfs is valid
If you run a

docker run command with --tmpfs /mountpoint:noexec

Or certain options that get translated into mount options, the mount command can get passed "" for mount data.
So this should be valid.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 89a775d2dc596b9ac86873edf447fff2f7012ef3
Component: engine
2015-12-22 14:15:07 -05:00
David Calavera 027f002cb3 Move Config and HostConfig from runconfig to types/container.
- Make the API client library completely standalone.
- Move windows partition isolation detection to the client, so the
  driver doesn't use external types.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7ac4232e70fe7cf7318333cd0890db7f95663079
Component: engine
2015-12-22 13:34:30 -05:00
David Calavera 2ecbc5b7f6 Remove usage of runconfig.ConvertKVStringsToMap in the API client library.
It's a very simple function that we can duplicate.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 747dccde41762f10d0afcdd9b243fb1ea85cbd9f
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera f1f019f89d Move ExecConfig to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 839f73c3028629ac1dde6617d6466b98f2bde416
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera b006691148 Replace usage of pkg/nat with go-connections/nat.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 056e7449039af522fa0a1567ef67916eaa0de93e
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera 3b25d376dd Move blkiodev package to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera d6be4062df Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d
Component: engine
2015-12-22 13:31:46 -05:00
David Calavera 7e8fcbf740 Move StrSlice to types.
This is a very docker concept that nobody elses need.
We only maintain it to keep the API backwards compatible.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b857a200696b07b67e6a7f94ede32487f5649d
Component: engine
2015-12-22 13:31:43 -05:00
Jess Frazelle 7bdc187f53 Merge pull request #18765 from Mashimiao/update-blkio-weight-device-test
update Blkio Tests name
Upstream-commit: 81c8e4d4c8937980f16ef7ac95d1710b5122aa46
Component: engine
2015-12-22 09:53:22 -08:00
Antonio Murdaca 56e3702320 Merge pull request #18844 from hqhq/hq_mv_oom_disable
Move OomKillDisable to resource
Upstream-commit: ac1187dc8d5b264bfa06a91ae3a300bdf4e7adbc
Component: engine
2015-12-22 18:52:24 +01:00
Jess Frazelle bcd4ff1dab Merge pull request #18837 from thaJeztah/remove-darwin-i386
Don't build Darwin 32-bit binaries
Upstream-commit: ff796e5bf740dba44c88132406892bf4c7050a92
Component: engine
2015-12-22 09:51:29 -08:00
Jess Frazelle 455533c9e7 Merge pull request #18851 from thaJeztah/update-contributing
Update contributing.md
Upstream-commit: b5fb5b9d006a7a392396fcdbc9490b89634dce63
Component: engine
2015-12-22 09:49:53 -08:00
Sebastiaan van Stijn 7572160b03 Merge pull request #18852 from errordeveloper/master
Update link for Weave Net plugin docs
Upstream-commit: 61e28f17a3524f2efffbd9c4f999b16ccf1c9236
Component: engine
2015-12-22 18:32:38 +01:00
Ilya Dmitrichenko 89fa05b282 Update link for Weave Net plugin docs
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Upstream-commit: 45241d36d349e0802cf12a2437a732b8c8c18479
Component: engine
2015-12-22 16:45:54 +00:00
David Calavera 8da2c14d42 Merge pull request #18847 from albers/completion-rename-functions
Better function names in bash completion
Upstream-commit: 5b913de5e68690c79563feb9a5082d5915371dcf
Component: engine
2015-12-22 08:43:08 -08:00
Tianon Gravi 563cdbee11 Merge pull request #18821 from oyld/script_fix
Fix syntax error in init script
Upstream-commit: eafecff25894cdf030f7c1994b384afce183881e
Component: engine
2015-12-22 06:48:22 -08:00
Sebastiaan van Stijn bca02abda3 Update contributing.md
- Add a link to the new procedures for adding maintainers
- Remove section about monthly IRC meetings, which are in flux

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6150157e8f00d957b279483a7b21e4f299318a98
Component: engine
2015-12-22 15:42:36 +01:00
Sebastiaan van Stijn 03d3eb96c2 Move Victor to alumni
Victor is now a maintainer for Docker Swarm, and no
longer active as a maintainer for this repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff3687c965dc544df6cbe9c4616f2aa601a13853
Component: engine
2015-12-22 15:00:21 +01:00
Harald Albers 2d930c1a34 Better function names in bash completion
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e715daab3d531725dc4faef2265337d133bd16bc
Component: engine
2015-12-22 13:38:02 +01:00
oyld 02f28288ea Fix syntax error in init script
Signed-off-by: oyld <oyld0210@163.com>
Upstream-commit: bbbc01b86edf9a5676ad735d008097942e0a93ac
Component: engine
2015-12-22 04:00:00 -08:00
Qiang Huang 885ff722b9 Move OomKillDisable to resource
1. It's a cgroup api, fit the general defination that we take
cgroup options as kind of resource options.
2. It's common usage and very helpful as explained here:
https://github.com/docker/docker/pull/18270#issuecomment-160561316
3. It's already in `Resource` struct in
daemon/execdriver/driver_unix.go

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8498ed73f7b35da807b5d5dcf532114c7b3df52d
Component: engine
2015-12-22 16:08:04 +08:00
Ma Shimiao 8c2d6245d9 upate TestRunWithBlkioInvalidWeightDevice with clearly invalid device name
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 673f2b8697727a0f0bfb3c4bd049cdac89a5a508
Component: engine
2015-12-22 12:43:42 +08:00
Aaron Lehmann ccad5598d4 When a manifest is not found, allow fallback to v1
PR #18590 caused compatibility issues with registries such as gcr.io
which support both the v1 and v2 protocols, but do not provide the same
set of images over both protocols. After #18590, pulls from these
registries would never use the v1 protocol, because of the
Docker-Distribution-Api-Version header indicating that v2 was supported.

Fix the problem by making an exception for the case where a manifest is
not found. This should allow fallback to v1 in case that image is
exposed over the v1 protocol but not the v2 protocol.

This avoids the overly aggressive fallback behavior before #18590 which
would allow protocol fallback after almost any error, but restores
interoperability with mixed v1/v2 registry setups.

Fixes #18832

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9d6acbee92016c47796ee8751dce9c59056f850d
Component: engine
2015-12-21 18:19:38 -08:00
Sebastiaan van Stijn 73614850c7 Don't build Darwin 32-bit binaries
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 814ce44d5ad442b940e44b41eff00bac0e579fc6
Component: engine
2015-12-22 00:08:18 +01:00
Sebastiaan van Stijn 161c03c6c1 Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
Vincent Demeester a9aa983363 Merge pull request #18809 from thaJeztah/EOL-ubuntu-15.04-vivid
Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL
Upstream-commit: eff810aed688879f67a3730c41d9adce4637470f
Component: engine
2015-12-21 22:02:18 +01:00
James Carey def74d9c92 Use of checkers in docker_cli_pull_test.go
Signed-off-by: James Carey <jecarey@us.ibm.com>
Upstream-commit: 1b010516d09fb587999eff6abb69cc76b25f7944
Component: engine
2015-12-21 14:04:38 -06:00
Brian Goff 8ae70ed554 Merge pull request #18811 from runcom/fix-volume-debug
volume: store: store.go: fix debug message
Upstream-commit: 8537501ebd433d19eeae99664d78dc9f2cecf05c
Component: engine
2015-12-21 13:18:39 -05:00