Граф коммитов

20833 Коммитов

Автор SHA1 Сообщение Дата
David Calavera fc87c5a2f1 Merge pull request #18876 from konstruktoid/tmpfs_apparmor
add /bin/tar to apparmor profile
2015-12-23 11:39:38 -08:00
David Calavera 577cf61afa Merge pull request #18863 from dnephin/upgrade_connections_pkg
Update go-connections vendor to pickup addition of parser functions
2015-12-23 10:02:25 -08:00
David Calavera 95b708cf19 Merge pull request #18839 from aaronlehmann/v1-fallback-404
When a manifest is not found, allow fallback to v1
2015-12-23 10:01:39 -08:00
David Calavera 0295b0a026 Merge pull request #18875 from thaJeztah/move-erikh-to-alumni
Move Erik to alumni
2015-12-23 09:15:59 -08:00
Thomas Sjögren 602498d1b0 add /bin/tar to apparmor profile
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-12-23 18:11:16 +01:00
Sebastiaan van Stijn fae00ad445 Move Erik to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-23 18:01:02 +01:00
Sebastiaan van Stijn 8022d1159d Merge pull request #18874 from duglin/falseDocs
remove =false from options that default to false in the docs
2015-12-23 16:34:44 +01:00
Doug Davis e6115a6c1c 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>
2015-12-23 07:11:35 -08:00
Sebastiaan van Stijn 4432a89821 Merge pull request #17782 from WeiZhang555/network-ls-nopre
Add filter for `network ls` to hide predefined network
2015-12-23 13:59:17 +01:00
Zhang Wei 26dd026bd7 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>
2015-12-23 13:26:40 +08:00
Daniel Nephin b8659da214 Remove unused parser functions that were replaced by go-connections/nat.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-22 19:06:49 -05:00
Daniel Nephin fcc24995e0 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-22 18:59:47 -05:00
Sebastiaan van Stijn 1105caa7f1 Merge pull request #18860 from dnephin/remove_migrate_if_downlevel
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
2015-12-23 00:08:36 +01:00
David Calavera eacedcbe21 Merge pull request #18831 from calavera/test_event_observer
Extract event processing to a common function for testing.
2015-12-22 15:04:32 -08:00
Sebastiaan van Stijn 45033c0bde Merge pull request #18757 from thaJeztah/patch-release-process
Document process for patch-releases
2015-12-22 23:42:34 +01:00
Arnaud Porterie 319d488e6e Merge pull request #18858 from thaJeztah/adieu-vieux
Move Victor to alumni
2015-12-22 14:38:54 -08:00
Alexander Morozov 030347c3c9 Merge pull request #18762 from calavera/runconfig_to_types
Move container configuration types to api/types/container.
2015-12-22 14:22:08 -08:00
David Calavera af51df20bd 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>
2015-12-22 17:10:06 -05:00
Daniel Nephin 0673361ef6 Remove migrateIfDownlevel and aufs migration from docker pre-0.7
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-22 16:45:42 -05:00
Alexander Morozov 9f228b37fc Merge pull request #18857 from calavera/catch_pipeline_error
Catch command pipeline error.
2015-12-22 13:34:56 -08:00
Tianon Gravi 0bbed98bc0 Merge pull request #18856 from albers/completion-network-rm
remove `--format` from bash completion for `docker network rm`
2015-12-22 12:38:11 -08:00
Alexander Morozov 9c89e83ff1 Merge pull request #18855 from rhatdan/volume-tmpfs
No options to tmpfs is valid
2015-12-22 12:24:51 -08:00
David Calavera f38257308b 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>
2015-12-22 15:17:15 -05:00
Harald Albers f03695efc1 remove `--format` from bash completion for `docker network rm`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-22 11:35:41 -08:00
Dan Walsh 89a775d2dc 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>
2015-12-22 14:15:07 -05:00
David Calavera 7ac4232e70 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>
2015-12-22 13:34:30 -05:00
David Calavera 747dccde41 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>
2015-12-22 13:31:46 -05:00
David Calavera 839f73c302 Move ExecConfig to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
David Calavera 056e744903 Replace usage of pkg/nat with go-connections/nat.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
David Calavera 0aab83d996 Move blkiodev package to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
David Calavera ad7fa01102 Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
David Calavera f9b857a200 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>
2015-12-22 13:31:43 -05:00
Jess Frazelle 81c8e4d4c8 Merge pull request #18765 from Mashimiao/update-blkio-weight-device-test
update Blkio Tests name
2015-12-22 09:53:22 -08:00
Antonio Murdaca ac1187dc8d Merge pull request #18844 from hqhq/hq_mv_oom_disable
Move OomKillDisable to resource
2015-12-22 18:52:24 +01:00
Jess Frazelle ff796e5bf7 Merge pull request #18837 from thaJeztah/remove-darwin-i386
Don't build Darwin 32-bit binaries
2015-12-22 09:51:29 -08:00
Jess Frazelle b5fb5b9d00 Merge pull request #18851 from thaJeztah/update-contributing
Update contributing.md
2015-12-22 09:49:53 -08:00
Sebastiaan van Stijn 61e28f17a3 Merge pull request #18852 from errordeveloper/master
Update link for Weave Net plugin docs
2015-12-22 18:32:38 +01:00
Ilya Dmitrichenko 45241d36d3 Update link for Weave Net plugin docs
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2015-12-22 16:45:54 +00:00
David Calavera 5b913de5e6 Merge pull request #18847 from albers/completion-rename-functions
Better function names in bash completion
2015-12-22 08:43:08 -08:00
Tianon Gravi eafecff258 Merge pull request #18821 from oyld/script_fix
Fix syntax error in init script
2015-12-22 06:48:22 -08:00
Sebastiaan van Stijn 6150157e8f 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>
2015-12-22 15:42:36 +01:00
Sebastiaan van Stijn ff3687c965 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>
2015-12-22 15:00:21 +01:00
Harald Albers e715daab3d 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>
2015-12-22 13:38:02 +01:00
oyld bbbc01b86e Fix syntax error in init script
Signed-off-by: oyld <oyld0210@163.com>
2015-12-22 04:00:00 -08:00
Qiang Huang 8498ed73f7 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>
2015-12-22 16:08:04 +08:00
Ma Shimiao 673f2b8697 upate TestRunWithBlkioInvalidWeightDevice with clearly invalid device name
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-22 12:43:42 +08:00
Aaron Lehmann 9d6acbee92 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>
2015-12-21 18:19:38 -08:00
Sebastiaan van Stijn 814ce44d5a 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>
2015-12-22 00:08:18 +01:00
Sebastiaan van Stijn 312c82677b Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
Add support for blkio read/write iops device
2015-12-21 23:45:18 +01:00
Vincent Demeester eff810aed6 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
2015-12-21 22:02:18 +01:00