Commit Graph

20427 Commits

Author SHA1 Message Date
Sebastiaan van Stijn a848c5e782 Cleanup MAINTAINERS file
This removes sections from the maintainers file
that have been moved to the https://github.com/docker/opensource
repository.

Also replaces spaces for tabs for consistency (yay ocd).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-09 00:20:23 +01:00
Derek McGowan e8a0e126f7 Merge pull request #18503 from aaronlehmann/test-pull-all-tags
Fix flaky test TestPullAllTagsFromCentralRegistry
2015-12-08 14:15:55 -08:00
Tianon Gravi 44f709ab07 Merge pull request #18506 from tophj-ibm/power-and-z-frozen-images-fix
Fixes for building on ppc64le and 390x due to ensure-frozen-images
2015-12-08 13:58:25 -08:00
Jess Frazelle 6d2130ee8e Merge pull request #18484 from aaronlehmann/progress-fixes
JSONMessage terminal display fixes
2015-12-09 10:56:24 +13:00
Tianon Gravi de7b80db03 Merge pull request #18465 from albers/completion-network-disconnect-2
Improve bash completion for `docker network disconnect`
2015-12-08 12:46:15 -08:00
David Calavera 81014900d5 Merge pull request #18505 from estesp/overlay-userns-fix
Fix overlay + user namespaces underlay dir permissions
2015-12-08 12:44:46 -08:00
Alexander Morozov 591493bfb5 Merge pull request #18485 from aaronlehmann/errors-bounds-check
Add missing bounds check in ContinueOnError
2015-12-08 12:40:55 -08:00
Phil Estes 191cefbaca Fix overlay and user namespace permissions
All underlay dirs need proper remapped ownership. This bug was masked by the
fact that the setupInitLayer code was chown'ing the dirs at startup
time. Since that bug is now fixed, it revealed this permissions issue.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-08 14:28:28 -05:00
Christopher Jones 03fc212b6d Fixes for ppc64le and 390x frozen-images
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-08 14:26:34 -05:00
Aaron Lehmann d17669999f Fix flaky test TestPullAllTagsFromCentralRegistry
This test was directly comparing lines of output from "docker images".
Sometimes, when busybox had been pushed to the hub recently, the
relative creation times would differ like this:

... obtained []string = []string{"busybox", "latest", "d9551b4026f0", "27", "minutes", "ago", "1.113", "MB"}
... expected []string = []string{"busybox", "latest", "d9551b4026f0", "26", "minutes", "ago", "1.113", "MB"}

Fixing by removing the time-since-creation fields from the comparison.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-08 11:23:04 -08:00
Aaron Lehmann 1ebfa29954 Add missing bounds in ContinueOnError
ContinueOnError assumes that something of type errcode.Errors contains
at least one error. This is generally true, but might not be true if the
remote registry returns an empty error body or invalid JSON. Add the
bounds check, and in the case where it fails, allow fallbacks to v1.

Fixes #18481

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-08 09:54:20 -08:00
Alexander Morozov adb19755e1 Merge pull request #18479 from aaronlehmann/flaky-logs-test
Fix flaky test TestLogsSince
2015-12-08 09:03:39 -08:00
Vincent Demeester 6eeff9288b Merge pull request #18488 from aaronlehmann/docker-images-order
Make order of items in "docker images" deterministic
2015-12-08 15:35:59 +01:00
Phil Estes 5c45f47f01 Merge pull request #18487 from clnperez/gccgo-seccomp-support
Add seccomp stuff for gccgo
2015-12-08 09:29:09 -05:00
Sebastiaan van Stijn 0d8c1a8797 Merge pull request #18432 from thaJeztah/docs-run-reference-fixups
docs: markdown and textual fixups in reference/run.md
2015-12-08 15:16:51 +01:00
Vincent Demeester ee7a599351 Merge pull request #18483 from estesp/seccomp-test-requirement
Allow non-seccomp platforms to pass integration-cli tests
2015-12-08 08:38:06 +01:00
Aaron Lehmann 6e37b622d3 Make order of items in "docker images" deterministic
The server-side portion of "docker images" sorts the images it returns
by creation timestamp so the list keeps a consistent order. However, it
does not sort the RepoTags and RepoDigests lists that each image carries
along with it. Since items in these lists are populated from a map,
their order will vary. If the user has a collection of tags which point
to overlapping IDs, for example tags that point to the same images on
different registries, the order will fluctuate between invocations of
"docker images". This can be disorienting with a long list of images.

Sort these references at the tag store level, so that the tag store's
References call always returns references in a lexically sorted order.
As well as giving the tag store more deterministic behavior, doing it at
this level simplifies the tag store unit tests.

Do the same for the ReferencesByName call. This will make push-all-tags
iterate over the tags in a consistent order.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-07 18:31:51 -08:00
Christy Perez 8ce5d05492 Add seccomp stuff for gccgo
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-12-07 19:40:55 -06:00
Phil Estes 0433e38915 Allow non-seccomp platforms to pass integration-cli tests
Since seccomp is still a configurable build-tag, add a requirements
entry for seccomp, as well as move seccomp tests to "_unix" given it
won't be applicable to other platforms at this time.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-07 20:14:52 -05:00
Aaron Lehmann 59df2adc07 Fix the scoping of "diff" so its value doesn't leak between loop iterations
In the existing code, "diff" has function scope and the value from the
previous iteration may be used if it is not reset. This appears to be an
oversight. This commit changes its scope to the for loop body.

One confusing point is that the cursor movement escape sequences appear
to be necessary even if the requested movement is 0. I haven't been able
to figure out why this makes a difference.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-07 17:01:47 -08:00
Aaron Lehmann fc41d39394 Don't update lines on the terminal from a previous operation
When we handle a message that isn't tracked in the "line" map (for
example, one with no ID), clear the line map. This means we won't update
lines that were part of a previous, completed set of operations when
doing something like pull -a. It also has the beneficial side effect
of avoiding terminal glitching in these types of situations, since
messages that don't get tracked in the "line" map cause the count of the
number of lines to get out of sync.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-07 16:04:42 -08:00
Sebastiaan van Stijn b36b492039 Merge pull request #18108 from phemmer/no-mtu-discovery
don't try to use default route MTU as container MTU
2015-12-08 00:26:29 +01:00
Patrick Hemmer fd9d7c02fc don't try to use default route MTU as bridge MTU
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
2015-12-07 17:32:51 -05:00
Alexander Morozov 1f0886a713 Merge pull request #18476 from aaronlehmann/v1-push-size
Use DiffSize instead of Size in v1 push
2015-12-07 14:09:14 -08:00
Aaron Lehmann 7ab0f9bf61 Fix flaky test TestLogsSince
This test can fail if it is run close to a second boundary:

    FAIL: docker_cli_logs_test.go:169: DockerSuite.TestLogsSince

    docker_cli_logs_test.go:183:
        c.Assert(out, checker.Not(checker.Contains), v,
    check.Commentf("unexpected log message returned, since=%v", since))
    ... obtained string = "" +
    ...     "2015-12-07T19:54:45.000551883Z 1449518084 log2\n" +
    ...     "2015-12-07T19:54:47.001310929Z 1449518086 log3\n"
    ... substring string = "log2"
    ... unexpected log message returned, since=1449518085

The problem is that it generates log lines using date +%s and uses that
timestamp as a reference for log filtering with (--since) later on in
the test. However, the timestamp that date +%s generates may not match
the log timestamp.

This commit changes the test to parse the log timestamp itself instead
of relying on a parallel timestamp.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-07 13:26:30 -08:00
Aaron Lehmann 741924384e Use DiffSize instead of Size in v1 push
The v1 push code was querying the size of the layer chain up to the
layer it was pushing, rather than just that layer. This made the
progress indicator inaccurate.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-07 11:30:05 -08:00
Brian Goff 41ae615aa1 Merge pull request #18442 from MHBauer/move-configs
move configs structs to remove dependency on deamon
2015-12-07 13:38:43 -05:00
Morgan Bauer 63fb931a0b
move configs structs to remove dependency on daemon
- Moved the following config structs to api/types
   - ContainerRmConfig
   - ContainerCommitConfig

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-12-07 09:03:25 -08:00
Sebastiaan van Stijn 5f1af8da5b Merge pull request #18449 from coolljt0725/plugins_cleanup
pkg/plugins/client.go: don't try to encode os decode if it's nil
2015-12-07 16:03:28 +01:00
Phil Estes 7d6a2e3cf5 Merge pull request #18451 from WeiZhang555/net-err
Better error message for network connect
2015-12-07 09:17:48 -05:00
Tibor Vass 1f8efc687c Merge pull request #18123 from aidanhs/aphs-fail-on-broken-tar
Ensure adding a broken tar doesn't silently fail
2015-12-07 14:38:21 +01:00
Doug Davis 2ecbc9774b Merge pull request #18463 from haoshuwei/modify-containerinspect-tocheckstatuscode
Modify docker inspect client to check statusCode instead of strings c…
2015-12-07 07:55:26 -05:00
Doug Davis 0bb4f82d2d Merge pull request #18425 from wenchma/18424-ErrorCodeNoSuchContainer
Correct the message of ErrorCodeNoSuchContainer to "No such container"
2015-12-07 07:48:04 -05:00
Tibor Vass ce7ae7868e Merge pull request #18468 from iGusev/patch-1
added rm flag to backup/restore commands in examples
2015-12-07 13:38:16 +01:00
Tibor Vass f7c0d0ec50 Merge pull request #18105 from mishak87/registry-improvements
Registry tiny code improvements
2015-12-07 13:35:02 +01:00
Ilya Gusev 8923c30b4a Update dockervolumes.md
added rm flag to backup/restore commands in examples

Signed-off-by: Ilya Gusev <mail@igusev.ru>
2015-12-07 15:20:10 +03:00
Vincent Demeester 6fcd33b576 Merge pull request #18462 from haoshuwei/modify-networkinspect-tocheckstatuscode
Modify docker network inspect client to check statusCode instead of s…
2015-12-07 12:48:41 +01:00
Tibor Vass ba77a5b46f Merge pull request #18329 from liusdu/mount_err
Fix rm container error in aufs and devicemapper after daemon crash
2015-12-07 12:47:52 +01:00
Shuwei Hao 6306eb3cd3 Modify docker network inspect client to check statusCode instead of string contain
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-12-07 10:11:46 +00:00
Shuwei Hao e719c9225c Modufy docker inspect client to check statusCode instead of strings contains
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com>
2015-12-07 10:03:46 +00:00
Zhang Wei 8edb941b79 Better error message for network connect
Use better error message when user want to connect container with same
name to one network, this can help avoid confusion.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-07 17:39:13 +08:00
Sebastiaan van Stijn 91657008f2 Merge pull request #18458 from vdemeester/fix-volume-test
Fix DockerSuite.TestVolumeCliInspectMulti
2015-12-07 10:26:18 +01:00
Harald Albers d7c9ae60e6 Improve bash completion for `docker network disconnect`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-07 09:55:00 +01:00
Vincent Demeester d125ddaeda Fix DockerSuite.TestVolumeCliInspectMulti
Use dockerCmdWithError now that it actually returns an error code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-12-07 08:34:18 +01:00
James Turnbull 78d8df73b5 Merge pull request #18460 from thaJeztah/fix-pull-by-digest
docs: fix pull by digest example
2015-12-06 18:08:51 -06:00
Sebastiaan van Stijn f27572312f Fix pull by digest example
Also reduced the column spacing in the output, so
that more output is visible in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-07 00:58:46 +01:00
James Turnbull 6b8d8bfbf8 Merge pull request #18454 from dcylabs/master
added albatros library
2015-12-06 15:01:55 -06:00
dcylabs a94bede2aa added albatros library
Signed-off-by: dcylabs <dcylabs@gmail.com>
2015-12-06 20:40:42 +01:00
Sebastiaan van Stijn 715f6a135c Merge pull request #17741 from dhiltgen/pull_token
Add token pass-thru for AuthConfig
2015-12-06 16:40:06 +01:00
Vincent Demeester 32f08e06e6 Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api
Remove CLI specific information for API error messages. Issue #17147
2015-12-06 16:02:40 +01:00