clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-26 18:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,966 Commits 9 Branches 112 Tags
d550fbb80e0ecf4b10c14e8b06bc8606101696dd
Commit Graph

18966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuan Sun d550fbb80e update TestRunWithBlkioInvalidWeight 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-14 16:20:52 +08:00
Michael Crosby 3ad9cc996a Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9 
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
 2015-10-13 16:56:19 -07:00
Tibor Vass 9c94dcea3d Merge pull request #16863 from dhiltgen/bump_libkv 
Bump to latest libkv + dependencies
 2015-10-13 15:57:42 -07:00
Tibor Vass a17e53038d Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-13 15:48:13 -07:00
Michael Crosby 6ae6371d11 Merge pull request #16996 from jfrazelle/cleanup-no-reprepro 
update release-deb from the reprepro stuff we don't use
 2015-10-13 15:46:58 -07:00
Jessica Frazelle 3057f0f0a7 update release-deb from the reprepro stuff we don't use 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-13 15:42:39 -07:00
Tibor Vass 2465ab8814 Merge pull request #16991 from Microsoft/10662-fixuserns 
Windows: [TP4] Fix AV due to userns
 2015-10-13 15:16:36 -07:00
Daniel Hiltgen 7078e7ddf4 Bump to latest libkv/libnetwork + dependencies 
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-10-13 14:41:43 -07:00
Alexandre Beslic 4ea3ff7061 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
 2015-10-13 14:41:19 -07:00
Vincent Demeester ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
 2015-10-13 23:16:10 +02:00
John Howard 6d71f27760 Windows: Fix AV in build due to userns 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-13 14:02:25 -07:00
moxiegirl 9be87c9a96 Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634 
updating docs for EXPOSE option on run command
 2015-10-13 11:33:28 -07:00
Jess Frazelle 3fc75c9739 Merge pull request #16922 from albers/completion-network 
[Fix #16919] Add bash completion for `docker network`
 2015-10-13 11:25:54 -07:00
Sven Dowideit dd43c23812 Merge pull request #16981 from sallyom/typos-man 
various man page typos
 2015-10-14 04:25:26 +10:00
Madhu Venugopal cc6aece1fd IPAM API & UX 
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 11:03:03 -07:00
Madhu Venugopal 0f351ce364 Docker side changes for the newly introduced IPAM driver 
* Made use of IPAM driver primitives for legacy IP configurations
* Replaced custom Generics with backend labels

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 10:52:59 -07:00
Madhu Venugopal 2e3113aeef Vendoring in libnetwork ipam support 
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 10:52:49 -07:00
moxiegirl 9ead1663c3 Merge pull request #16946 from pwnall/cpu_quota_docs 
Document CFS CPU period / quota support in the API
 2015-10-13 10:51:48 -07:00
Brian Goff b7d921e1b5 Merge pull request #16963 from Microsoft/10662-kill-partone 
Windows: Enable kill (part one)
 2015-10-13 13:02:58 -04:00
Sebastiaan van Stijn e766a3505c Merge pull request #16985 from moxiegirl/carry-dup-text-16961 
Centralize discussion of behavior label and env.
 2015-10-13 09:48:44 -07:00
Mary Anthony 39a71acf7e Centralize discussion of behavior label and env. 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-13 09:44:17 -07:00
Sebastiaan van Stijn 3856c5efa6 Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs 
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
 2015-10-13 09:30:32 -07:00
Tibor Vass 0bc748bba3 Merge pull request #16956 from runcom/16665-fix-inspect-Config-api120 
Return old Config fields for API < v1.20
 2015-10-13 09:08:26 -07:00
Sally O'Malley d79860af87 various man page typos 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-10-13 11:52:14 -04:00
Mike Brown d955fdb9ac updating docs for EXPOSE option on run command; fixes #16634 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2015-10-13 10:43:27 -05:00
John Howard 2dca1bc633 Windows: Enable kill (part one) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-13 08:42:47 -07:00
Vincent Demeester 5ecbc9747f Merge pull request #16303 from coolljt0725/add_docker_info_show_base_size 
Add docker info show base filesystem size of container/image when use devicemapper
 2015-10-13 14:43:52 +02:00
Antonio Murdaca 8c63ce4f6b Fix Config.Cpuset from API < 1.20 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
 2015-10-13 09:09:05 +02:00
Vincent Demeester cd426ebed7 Add docs for label/env log-opts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-13 08:39:47 +02:00
Tibor Vass 9a13c2dc79 Merge pull request #16958 from tonistiigi/digest-collision 
Make sure tags and digests don’t collide
 2015-10-12 15:45:34 -07:00
Tibor Vass 09ddb67dd4 Merge pull request #16962 from estesp/check-network-files-exist 
Make sure network files exist before adding them to mounts
 2015-10-12 15:38:51 -07:00
Jess Frazelle df79536769 Merge pull request #16009 from azurezk/vol-create-conflict-option 
volume create error on conflict option
 2015-10-12 15:27:36 -07:00
Sebastiaan van Stijn dc500630ec Merge pull request #16942 from physicalit/master 
Add CMD and EXPOSE instruction example
 2015-10-12 15:26:30 -07:00
moxiegirl c59e24ff12 Merge pull request #16888 from dhiltgen/discovery_tls 
Document updates for cluster-store-opt
 2015-10-12 15:26:08 -07:00
Tonis Tiigi d08ca5c2b6 Make sure tags and digests don’t collide 
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.

Reverts #14664

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-10-12 14:20:11 -07:00
Phil Estes ed68486f68 Make sure network files exist before adding them to mounts 
It is possible that network files do not exist, especially in the case
of `--net=host` where a host OS (like CoreOS) does not use certain
standard network files.  This patch verifies that the source file of a
network mount point exists before adding it to the list of mount points
for bind mounting from the container's metadata directory.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-12 17:18:34 -04:00
Arnaud Porterie 96965e2abd Merge pull request #16954 from jfrazelle/update-changelog-master 
Update changelog master
 2015-10-12 12:31:15 -07:00
Jess Frazelle eebf88ffd3 Merge pull request #16953 from aaronlehmann/master-security 
Add 1.8.3 security fixes to master
 2015-10-12 12:20:49 -07:00
Daniel Dao 0083f6e984 add labels/env log option for jsonfile 
this allows jsonfile logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`.

Extra attributes are saved into `attrs` attributes for each log data.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2015-10-12 21:12:46 +02:00
Daniel Dao 11a24f19c2 add labels/env log option for journald 
this allows journald logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2015-10-12 21:12:46 +02:00
Daniel Dao 4cc8490283 add labels/env log option for fluentd 
this allows fluentd logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2015-10-12 21:12:46 +02:00
Daniel Dao 5794a0190d add labels/env log option for gelf 
this allows gelf logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Additional log field will be prefixed with `_` as per gelf protocol
https://www.graylog.org/resources/gelf/

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2015-10-12 21:12:46 +02:00
Daniel Dao 656cdbb0e9 add env and labels to log context 
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2015-10-12 21:12:46 +02:00
Vincent Demeester 151564d39b Merge pull request #16904 from vikstrous/fish_completion_bug 
fix fish completion wrong image names bug
 2015-10-12 20:42:24 +02:00
Vincent Demeester 0b122dc55b Merge pull request #16914 from coolljt0725/add_userns_check 
Add user namespace check to check-chonfig.sh
 2015-10-12 20:39:46 +02:00
Jess Frazelle 6bacb32755 Merge pull request #16934 from sdurrheimer/zsh-completion-docker-network 
Add zsh completion for 'docker network'
 2015-10-12 11:29:57 -07:00
Jessica Frazelle 01ca4f621d bump version back to 1.9.0-dev 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-12 11:18:28 -07:00
Jessica Frazelle ec97bc9394 bump version for v1.8.3 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit f4bf5c7026)
 2015-10-12 11:18:04 -07:00
Michael Crosby 8a71e005b4 Merge pull request #16951 from icecrime/maintainers_rm_fred 
Remove fredlf from MAINTAINERS
 2015-10-12 11:07:50 -07:00
Arnaud Porterie c2d21fa9d3 Remove fredlf from MAINTAINERS 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-10-12 10:58:04 -07:00