Commit Graph

19098 Commits

Author SHA1 Message Date
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
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
Phil Estes 1c783567c0 Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
Use of checkers on docker_cli_inspect_experimental_test.go
2015-10-19 08:21:17 -04:00
liaoqingwei f3b2b8700f Use of checkers on docker_cli_inspect_experimental_test.go.
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-19 19:44:04 +08:00
weiyan 7be79767c1 use of checkers on docker_cli_diff_test.go
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:07:59 +08:00
Antonio Murdaca eaa1fc41c6 Merge pull request #16897 from sunyuan3/docker_cli_rm_test
use of checkers on docker_cli_rm_test.go
2015-10-19 09:14:23 +02:00
Vincent Demeester cfdb954303 Merge pull request #17162 from echo33/docker_cli_exec_unix_test
use of checkers on docker_cli_exec_unix_test.go
2015-10-19 08:54:42 +02:00
weiyan d65ac42ca8 use of checkers on docker_cli_exec_unix_test.go
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 15:14:59 +08:00
Yuan Sun 0780ddc498 use of checkers on docker_cli_rm_test.go
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-19 10:42:56 +08:00
Jan-Gerd Tenberge ab31d9500e Fix spelling error, add Noether and Euler
Signed-off-by: Jan-Gerd Tenberge <janten@gmail.com>
2015-10-19 01:14:39 +02:00
moxiegirl bab701c143 Merge pull request #17157 from ripcurld00d/fedora_doc
Update fedora doc
2015-10-18 14:41:07 -07:00
ripcurld00d 6a64865991 Update fedora doc
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2015-10-18 23:00:23 +03:00
Vincent Demeester bece5b82a8 Merge pull request #17008 from liaoqingwei/dev1
Update testcases: use of checkers on docker_cli_nat_test.go
2015-10-18 18:11:02 +02:00
liaoqingwei 26ae6d6b36 Use of checkers on docker_cli_nat_test.go.
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-18 20:02:55 +08:00
moxiegirl ef49d127e3 Merge pull request #17141 from thaJeztah/fix-17140-storage-driver-formatting
docs: fix storage driver options list
2015-10-17 19:33:40 -07:00
Sebastiaan van Stijn 8f36ded5b1 docs: fix storage driver options list
This fixes the indentation of the storage driver
options list.

Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML

Fixes #17140

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-17 19:17:07 -07:00
Vincent Batts 2726434f72 Merge pull request #16960 from pydima/9283_consider_hard_links_in_image_size
Consider hardlinks in image size.
2015-10-17 14:22:33 -04:00
Sebastiaan van Stijn cffd50752c Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
Vendoring new go-check checkers and use checker for docker_api_build_test.go
2015-10-17 08:50:51 -07:00
Vincent Demeester 253f975fdb Use checker assert for docker_api_build_test.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 14:28:13 +02:00
Vincent Demeester 9685b4767f Vendoring shakers library and update go-check
The shakers library defines a bunch of go-check checkers to ease
writing tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 14:28:08 +02:00
Brian Goff 9b1fb0d45b Merge pull request #16871 from ZJU-SEL/fix_version_test
update docker_cli_version_test.go
2015-10-17 08:02:18 -04:00
Dmitry Vorobev 4102537cfd Fixes #9283. Consider hardlinks in image size.
Based on #8984. This patch fixes behavior when image size calculation
didn't consider hardlinks.

Signed-off-by: Dmitry Vorobev <dimahabr@gmail.com>
2015-10-17 12:24:05 +02:00
Antonio Murdaca ab1f03397e Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts
Deprecate -c cli short variant flag in docker cli build & create
2015-10-17 10:22:46 +02:00
Sebastiaan van Stijn e3fabf3ea1 Merge pull request #16831 from jfrazelle/release-updates
Release updates
2015-10-16 16:57:10 -07:00
David Calavera c3f42b29a8 Merge pull request #17113 from mountkin/validate-filter
make sure the value of the dangling filter is correct
2015-10-16 16:32:11 -07:00
Tobias Gesellchen 3e064371e7 docs: fix description of `filters` param for /volumes and /networks.
fixes #17091

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-10-17 00:24:40 +02:00
Tibor Vass 365a0db0f0 Merge pull request #17046 from mavenugo/dopts
driver-opts for network create
2015-10-16 15:23:59 -07:00
David Calavera ec7c368ff0 Merge pull request #16901 from WeiZhang555/rmi-inte
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
2015-10-16 15:23:00 -07:00
Vincent Demeester d8b4471a59 Merge pull request #16977 from mountkin/refactor-test
refactor integration test to use checkers
2015-10-17 00:22:03 +02:00
Antonio Murdaca 4fc97e40c9 Merge pull request #16950 from cpuguy83/support_ipv6_in_host_parser
Allow API to bind to ipv6 addresses
2015-10-17 00:20:49 +02:00
David Calavera 8c1fa7f320 Merge pull request #16994 from Microsoft/10662-copied
Windows: Fix annoying bad log
2015-10-16 15:14:08 -07:00
David Calavera 475be776b8 Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
remove incorrect "readonly" example
2015-10-16 15:11:48 -07:00
Vincent Demeester d1064bd441 Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 00:05:34 +02:00
David Calavera 258357857b Merge pull request #17065 from ZJaffee/api-exec-resize-test
cleaned up integration-cli/docker_api_exec_resize_test.go
2015-10-16 14:59:06 -07:00
David Calavera 3668be932e Merge pull request #16574 from Djelibeybi/rpm-changelog
Generate a full RPM changelog from the existing CHANGELOG.md file
2015-10-16 14:55:39 -07:00
Madhu Venugopal 6f3eb994b5 Pass network driver option in docker network command
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-16 14:33:54 -07:00
Madhu Venugopal cf1b5fe601 Vendoring libnetwork to Replace the label variable to DriverOpts
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-16 14:30:57 -07:00
Tibor Vass e23d834a01 Merge pull request #17106 from albers/completion-import
Add missing options to bash completion for `docker import`
2015-10-16 14:28:14 -07:00
Tibor Vass b1bab9e1e7 Merge pull request #17107 from albers/completion-build
Add missing options to bash completion for `docker build`
2015-10-16 14:27:51 -07:00
Vincent Demeester c56b02b284 Merge pull request #17081 from ZJaffee/api_network_test
Cleaned up integration-cli/docker_api_network_test.go
2015-10-16 23:14:17 +02:00
Vincent Demeester 8b90aefd14 Merge pull request #17121 from sdurrheimer/zsh-completion-fix-double-dash-option-arguments
Zsh : all --<option>= flag values may be given in the next argument
2015-10-16 23:13:25 +02:00
Brian Goff 84be89a273 Merge pull request #16969 from zhangjianfnst/16756-improve-integration-cli
Use c.Assert in integration-cli/docker_cli_logs_test.go
2015-10-16 16:55:44 -04:00
Steve Durrheimer b34aa69e8f Zsh completion : all --<option>= flag values may be given in the next argument
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-16 21:18:27 +02:00
Sebastiaan van Stijn ccf5b60c6f Merge pull request #17098 from sdurrheimer/zsh-completion-import-message
Add zsh completion for 'docker import -m --message'
2015-10-16 11:36:46 -07:00
Tibor Vass b054a88af1 Merge pull request #17093 from endophage/update_notary_gotuf
updating notary and gotuf with latest bugfixes
2015-10-16 11:19:21 -07:00
Zachary Jaffee 7b6bca5af1 cleaned up integration-cli/docker_api_exec_resize_test.go
Signed-off-by: Zachary Jaffee <zij@case.edu>
2015-10-16 13:22:40 -04:00
Sebastiaan van Stijn e2870bda43 Merge pull request #17085 from dnephin/add_digest_to_api_docs
Correct API docs for /images/create
2015-10-16 10:10:41 -07:00
Vincent Demeester 2afdab4454 Merge pull request #17100 from WeiZhang555/port-inte
update docker_cli_port_test.go with Assert
2015-10-16 19:06:14 +02:00