Alexandre Beslic
6ee3420542
Merge pull request #1315 from aluzzardi/golint-fix
...
Fix various golint issues.
2015-10-19 14:18:36 -07:00
Nathan LeClaire
447d262c06
Merge pull request #1939 from gmacario/fix-issue-1692
...
fix IPV6NetworkMaskPrefixLength value parsing
2015-10-19 14:17:51 -07:00
Andrea Luzzardi
58558f5224
Fix various golint issues.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-10-19 13:58:21 -07:00
Andrea Luzzardi
31cba69ac6
Merge pull request #1313 from denverdino/origin-master
...
Fix the problem for the orders of filters
2015-10-19 13:56:49 -07:00
Andrea Luzzardi
0399a3c60b
Fix nullptr panic in pending containers.
...
Fixes #1289
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-10-19 13:38:06 -07:00
Tibor Vass
82a8a14c4d
Merge pull request #17128 from calavera/network_controller_enabled
...
Do not initialize the networking routes when netController is not enabled.
2015-10-19 16:13:31 -04:00
Tibor Vass
1ab5ca2d5b
Merge pull request #17116 from dmcgowan/increase-ping-timeout
...
Increase ping timeout for registries
2015-10-19 16:10:01 -04:00
Nathan LeClaire
b818d3f7e8
Merge pull request #2000 from hairyhenderson/fix-non-logf-method-calls
...
💄 Fix log.* method calls which meant to be log.*f
2015-10-19 13:04:33 -07:00
Morgan Bauer
eedeeaf49c
use gocheck asserts instead of fatal
...
- for #16756
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-10-19 12:30:22 -07:00
Mazz Mosley
0e4f9c9a66
Environment keys can contain empty values
...
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-19 15:16:19 -04:00
Mazz Mosley
5fdb75b541
Improve error message for type constraints
...
It was missing a space between the different types, when there
were 3 possible type values.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-19 15:16:19 -04:00
Daniel Nephin
24d4a1045a
Fixes #2203 - properly validate files when multiple files are used.
...
Remove the single-use decorators so the functionality can be used directly as a function.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-19 15:16:19 -04:00
Stefan J. Wernli
a150eee308
Fixing hang in archive.CopyWithTar with invalid dst
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-10-19 11:56:05 -07:00
Dan Walsh
0c518b6ab2
Docker is calling cont.Destroy twice on success
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
2015-10-19 14:53:55 -04:00
Ying Li
d77d8f1ce8
Lint fix
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 11:52:43 -07:00
Ying Li
a5e64ecf03
Do not use the viper singleton instance everywhere
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 11:50:04 -07:00
David Calavera
b27fa6c58e
Merge pull request #16957 from MHBauer/eventsservice-refactor
...
refactor access to daemon member EventsService
2015-10-19 11:45:29 -07:00
Tonis Tiigi
fb4a725692
Don’t overwrite layer checksum on push
...
After v1.8.3 layer checksum is used for image ID
validation. Rewriting the checksums on push would
mean that next pulls will get different image IDs
and pulls may fail if its detected that same
manifest digest can now point to new image ID.
Fixes #17178
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-10-19 11:44:16 -07:00
David Calavera
eb982e7c00
Return 404 for all network operations without network controller.
...
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-10-19 14:40:18 -04:00
Olivier Gambier
aebd037c46
Merge pull request #2003 from blaggacao/patch-1
...
Close #2001 / consistent hyperv internal naming
2015-10-19 11:40:15 -07:00
Daniel Nephin
3725c3ab7e
Merge pull request #2225 from mnowster/2221-blank-env-vars
...
2221 allow empty environment keys
2015-10-19 14:06:31 -04:00
Daniel Nephin
938d49cbdc
Fixes #2205 - extends must be copied from override file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-19 13:41:58 -04:00
mnowster
f1f3acd070
Merge pull request #2210 from dnephin/fix_empty_override
...
Properly validate files when multiple files are used
2015-10-19 18:32:48 +01:00
Antonio Murdaca
850bc0838a
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-10-19 19:09:36 +02:00
Victor Vieux
2c2aa91f9f
fix test Dockerfile, use precompiled go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-19 09:55:27 -07:00
Antonio Murdaca
bb085b7661
Merge pull request #17125 from calavera/check_exec_start_json
...
Check the content type is json when calling exec start.
2015-10-19 18:44:42 +02:00
Morgan Bauer
2abf5d986e
refactor access to daemon member EventsService
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-10-19 09:41:29 -07:00
Daniel Nephin
937e087c6c
Fixes #2203 - properly validate files when multiple files are used.
...
Remove the single-use decorators so the functionality can be used directly as a function.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-19 12:39:45 -04:00
Doug Davis
e62fd33d96
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
2015-10-19 12:35:58 -04:00
Daniel Nephin
cd0b63879b
Merge pull request #2208 from dnephin/another_release_script_fix
...
Fix check for tags in release script `make-branch`
2015-10-19 12:34:25 -04:00
Daniel Nephin
129e2f9482
Fix check for tags.
...
If there is a branch with the same name as a tag it fails without the
--tags. This was only a problem when we're branching from a git tag.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-19 12:33:25 -04:00
Vincent Demeester
6e0f00ed0a
Merge pull request #16710 from gbarboza/sort_port_display
...
Sort PORTS order in docker ps output
2015-10-19 18:24:24 +02:00
mnowster
a75bdfe11c
Merge pull request #2220 from ticosax/trove-classifire
...
Add trove classifier to declare supported python versions.
2015-10-19 17:20:31 +01:00
Brian Goff
df15523745
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
2015-10-19 12:10:31 -04:00
Daniel Nephin
514f0650b2
Give the user a better error message (without a stack trace) when there is a yaml error.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-19 12:02:40 -04:00
Brian Goff
d0b4e7a064
Merge pull request #16986 from clnperez/test-inspect-warn-fix
...
Fix TestInspectInt64 for kernels without swap limit capability
2015-10-19 11:54:28 -04:00
David Calavera
45dc57f229
Check the content type is json when calling exec start.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-10-19 11:46:44 -04:00
Garrett Barboza
c4c6d33bbc
Change sorting method and add test to DisplayablePorts
...
Signed-off-by: Garrett Barboza <garrett@garrettbarboza.com >
2015-10-19 10:38:54 -05:00
Mazz Mosley
08add665e9
Environment keys can contain empty values
...
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-19 16:32:12 +01:00
mnowster
159cddf563
Merge pull request #2209 from dnephin/fix_error_on_invalid_yaml
...
Give the user a better error message when the yaml file is invalid
2015-10-19 16:29:36 +01:00
Li Yi
135bee98c9
Fix the problem for the orders of filters
...
Change-Id: I2dd652a1881cdaaff16e02f26c9f69f5df16419f
Signed-off-by: Li Yi <denverdino@gmail.com >
2015-10-19 23:07:20 +08:00
Steve Durrheimer
20d34c8b14
Add zsh completion for 'docker-compose --x-networking --x-network-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-19 10:38:22 -04:00
Daniel Nephin
076b5bc31c
Merge pull request #2197 from sdurrheimer/zsh-completion-network-options
...
Add zsh completion for 'docker-compose --x-networking --x-network-dri…
2015-10-19 10:37:57 -04:00
Harald Albers
6f45eb7959
bash completion for networking options
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-19 10:11:35 -04:00
Christy Perez
ae29bd435b
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-10-19 08:56:32 -05:00
Brian Goff
8005dbd748
Merge pull request #17127 from gesellix/docs-filters-query
...
docs: fix description of `filters` param for /volumes and /networks.
2015-10-19 09:49:37 -04:00
Mazz Mosley
ff83c459d0
Improve error message for type constraints
...
It was missing a space between the different types, when there
were 3 possible type values.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-19 14:36:56 +01:00
Lei Jitang
fbb01b8162
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-19 21:17:37 +08:00
Phil Estes
8eba018b61
Merge pull request #17155 from janten/meitner
...
Correct Lise Meitner's name, add Euler and Noether
2015-10-19 08:26:55 -04:00
Phil Estes
1f9557ac66
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
2015-10-19 08:25:32 -04:00