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
Olivier Gambier
d181f532c4
Merge pull request #1978 from dgageot/1974-fix-makefile
...
[WIP] Fix the Makefile
2015-10-13 14:17:33 -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
Mary Anthony
0e9c542865
Updating to new tooling:supports Github source linking
...
Fixing HEAD
Updating to match daniel
Fixing the index link
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-13 14:04:25 -07:00
Richard Scothern
4c4112bdcf
Merge pull request #1035 from aaronlehmann/host-parameter-alternate
...
Add http.host parameter
2015-10-13 14:03:48 -07: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
Stephen Day
bfd1f423c5
Merge pull request #1033 from jlhawn/api_spec_update_auth_errors
...
[api spec] Update authN and authZ errors
2015-10-13 13:52:18 -07:00
Diogo Mónica
bf783ff65f
Merge pull request #217 from mtrmac/circleci-make
...
Use Makefile targets for test/pre to avoid duplication
2015-10-13 13:34:19 -07:00
Miloslav Trmač
f677dcc1be
Use Makefile targets for test/pre to avoid duplication
...
Thus, we will actually test that the Makefile works.
Doesn’t yet convert test/override because the two already differ and
it’s not immediately obvious to me which one to use.
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-13 22:21:41 +02:00
Stephen Day
8aec18217a
Merge pull request #963 from dmcgowan/reference-update
...
[Carry 690] Add a new reference package abstracting tags and digests
2015-10-13 13:15:43 -07:00
Victor Vieux
49dc6498c1
Merge pull request #1285 from moxiegirl/retooling-hugo-15
...
Updating with new tooling that supports GitHub source Markdown
2015-10-13 12:55:53 -07:00
Alexandre Beslic
47d4563124
Merge pull request #1286 from vieux/fix_merge_issue
...
fix merge issue
2015-10-13 12:42:09 -07:00
Richard Scothern
6a4cdab380
Merge pull request #1083 from BrianBland/fixSwiftDocs
...
Fixes documentation for swift driver "container" parameter
2015-10-13 11:57:43 -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
Ying Li
517dd4bbd0
Rename MySQL to SQL in server DB tests
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-13 11:28:57 -07:00
Ying Li
df95dc4564
Add a DB health check to the server storage DB
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-13 11:28:14 -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
Alexandre Beslic
1e30ce215f
Merge pull request #1262 from vieux/libnetwork
...
add 'docker network' support
2015-10-13 11:09:27 -07: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
moxiegirl
2532d1b282
Merge pull request #1283 from MHBauer/docs-started
...
docs additions
2015-10-13 10:50:48 -07:00
David Lawrence
a16bd17b97
Merge pull request #216 from mtrmac/circleci-imports
...
Use canonical import paths instead of forked repo name
2015-10-13 10:20:57 -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
mnowster
129092b7b4
Merge pull request #2159 from dnephin/update_pip_install_docs
...
Update pip install instructions to be more reliable
2015-10-13 17:35:59 +01: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
Mazz Mosley
c1d5ecaafe
Workaround splitdrive limitations
...
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-13 17:27:25 +01:00
Daniel Nephin
9aaecf95a4
Update pip install instructions to be more reliable.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-13 12:25:06 -04: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
Mazz Mosley
bc6b3f970b
container paths don't need to be expanded
...
They should not ever be relative.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-13 17:03:09 +01: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
David Gageot
28656c0e42
Fix #1974 make clean after a make build-x#1974
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-13 17:24:08 +02:00
David Gageot
cd80b70d26
FIX #1914 Reject command lines with trailing flags
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-13 16:29:28 +02:00
Miloslav Trmač
18da3f6537
Use canonical import paths instead of forked repo name
...
The code referes to canonical import paths, so the code needs to be
available there even if CircleCI is building from a forked repository.
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-13 16:12:59 +02:00
mnowster
4b845746ef
Merge pull request #2154 from dnephin/publish_master_builds
...
Publish master builds to bintray
2015-10-13 14:50:25 +01:00
mnowster
928300478b
Merge pull request #2162 from dnephin/docs_cleanup_and_fixes
...
Docs changes, fixed some links, removed older links, etc
2015-10-13 14:25:33 +01: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
Shijiang Wei
a1d4b7dd0d
refactor integration test to use checkers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-10-13 20:21:38 +08:00
Mary Anthony
f1a64ea23a
Updating with new tooling that supports GitHub source Markdown
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-13 04:18:50 -07:00
Victor Vieux
5cbf0667c8
remove unused store test
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-13 04:15:55 -07:00
gdm85
7fc4aedd1c
Simplify fetch process by using go get
...
Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com >
2015-10-13 11:21:01 +02:00
Victor Vieux
6d6927d1de
fix merge issue
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-13 01:24:10 -07: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