Commit Graph

19084 Commits

Author SHA1 Message Date
04396c69aa Add the actual command in this example.
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: d8d38f234563a3be0b23cc94df3a9453eacfdee8
Component: engine
2015-12-09 10:17:39 -07:00
8a7da51391 Check minimum kernel memory limit to be 4M
Fixes: #18405

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 2347f98003af34dd1cfd290bf0f2cc7e6ae07b03
Component: engine
2015-12-09 14:26:41 +08:00
0284a047a6 Merge pull request #18515 from tophj-ibm/add-new-image-to-dockerfiles-hotfix
Add new ppc64le image
Upstream-commit: c8ed1492bfc651a86014af695894a4bb66fe52f9
Component: engine
2015-12-08 21:28:18 -05:00
a95271669d Added ppc64le ensure image to the Dockerfile
Adds ppc64le image to the Dockerfile,
should be with 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: a796eea2b526743d391ba2ea1f4a0bb03eb94bfe
Component: engine
2015-12-08 20:07:11 -05:00
1085599321 Merge pull request #18478 from programmerq/novirt
Call it "containerization" instead of "virtualization" in the docs
Upstream-commit: 8ed14c207256836f86308f76d88fc800bb34e5f1
Component: engine
2015-12-08 16:45:29 -08:00
6efe38c23e Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions
Fixed 80-docker.rules file permissions to 644
Upstream-commit: dead67308cf89d055a83ba66fd6a6bdc87e82f14
Component: engine
2015-12-08 16:28:54 -08:00
1afd981df8 Merge pull request #18517 from thaJeztah/cleanup-maintainers-file
Cleanup MAINTAINERS file
Upstream-commit: 82eb1045094d6b098d03b7893d9d65335711de4a
Component: engine
2015-12-08 16:11:04 -08:00
489511b2b1 Merge pull request #18507 from sammyshj/13397-untaggedimages
Docs now explain dangling images with repo:tag as <none>:<none>
Upstream-commit: fcddd9d2f56554ddacb798098cd72b553e799487
Component: engine
2015-12-08 15:52:03 -08:00
5227256eac 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>
Upstream-commit: a848c5e78214cb0f00bbd01bf069169ae90b0908
Component: engine
2015-12-09 00:20:23 +01:00
e937f06e2d Merge pull request #18503 from aaronlehmann/test-pull-all-tags
Fix flaky test TestPullAllTagsFromCentralRegistry
Upstream-commit: e8a0e126f73ec8773fd880b9eff54dba8eaf1dac
Component: engine
2015-12-08 14:15:55 -08:00
e1e5d41283 Change "virtualization" to "containerization"
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
21fc6d0f81 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
Upstream-commit: 44f709ab0700182729ad51fc2256373c96dc0f3f
Component: engine
2015-12-08 13:58:25 -08:00
eeaafa1340 Merge pull request #18484 from aaronlehmann/progress-fixes
JSONMessage terminal display fixes
Upstream-commit: 6d2130ee8e7ddebb31a0258ffe111adc0ecea273
Component: engine
2015-12-09 10:56:24 +13:00
c0f7df0a57 Merge pull request #18465 from albers/completion-network-disconnect-2
Improve bash completion for `docker network disconnect`
Upstream-commit: de7b80db0344a46ba948ce64df88017a69b6bfaa
Component: engine
2015-12-08 12:46:15 -08:00
baef4152d2 Merge pull request #18505 from estesp/overlay-userns-fix
Fix overlay + user namespaces underlay dir permissions
Upstream-commit: 81014900d5adeedf90ee6c90b5a79d19859b0958
Component: engine
2015-12-08 12:44:46 -08:00
8ac83c81d8 Merge pull request #18485 from aaronlehmann/errors-bounds-check
Add missing bounds check in ContinueOnError
Upstream-commit: 591493bfb56a3f7ad2338b7d6620ef8d631f21ef
Component: engine
2015-12-08 12:40:55 -08:00
6021acc699 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)
Upstream-commit: 191cefbaca45ba86341379d09d2f75d5fc1868fb
Component: engine
2015-12-08 14:28:28 -05:00
6140358db6 Fixes for ppc64le and 390x frozen-images
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e
Component: engine
2015-12-08 14:26:34 -05:00
7d8daf7bad 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>
Upstream-commit: d17669999fff55219f5ed236f00fdf8a08d09304
Component: engine
2015-12-08 11:23:04 -08:00
31c6e57b82 The docs now explain that images with repo:tag as <none>:<none> are dangling images.
Signed-off-by: Sambuddha Basu <sambuddhabasu1@gmail.com>
Upstream-commit: 1bafa3cdcd102041948375643a5e2752ad506e0c
Component: engine
2015-12-08 22:08:29 +04:00
a08a354855 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>
Upstream-commit: 1ebfa299545e5c2273ce449d72b10745b9e38087
Component: engine
2015-12-08 09:54:20 -08:00
b3330dfcec Merge pull request #18479 from aaronlehmann/flaky-logs-test
Fix flaky test TestLogsSince
Upstream-commit: adb19755e1d0b6e2e7693ddb7932f26e63d1b0b5
Component: engine
2015-12-08 09:03:39 -08:00
6b0cda08d9 Merge pull request #18488 from aaronlehmann/docker-images-order
Make order of items in "docker images" deterministic
Upstream-commit: 6eeff9288b885a79f5d12a32190e6e66b08388e5
Component: engine
2015-12-08 15:35:59 +01:00
cca42f456f Merge pull request #18487 from clnperez/gccgo-seccomp-support
Add seccomp stuff for gccgo
Upstream-commit: 5c45f47f015270712a24e10e652f3e31a845cd34
Component: engine
2015-12-08 09:29:09 -05:00
8d35d12a65 Merge pull request #18432 from thaJeztah/docs-run-reference-fixups
docs: markdown and textual fixups in reference/run.md
Upstream-commit: 0d8c1a879734029bb9127d2bdabec187c6b4c897
Component: engine
2015-12-08 15:16:51 +01:00
23cd48101e Merge pull request #18483 from estesp/seccomp-test-requirement
Allow non-seccomp platforms to pass integration-cli tests
Upstream-commit: ee7a599351c71a408872d8b48473e217d6aafd91
Component: engine
2015-12-08 08:38:06 +01:00
bf0c0fe703 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>
Upstream-commit: 6e37b622d39591038a4907ee7171a359076bc1db
Component: engine
2015-12-07 18:31:51 -08:00
90acef675d Add seccomp stuff for gccgo
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 8ce5d05492b27e2d27660ddc6d2292e3ee553607
Component: engine
2015-12-07 19:40:55 -06:00
86850a7309 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)
Upstream-commit: 0433e3891532a9783b77d6b02c041bab359b0d91
Component: engine
2015-12-07 20:14:52 -05:00
c64118158d 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>
Upstream-commit: 59df2adc071e0186ccd0ba7ea9387142e168d735
Component: engine
2015-12-07 17:01:47 -08:00
a646b23843 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>
Upstream-commit: fc41d393946e6da59792da9ed6e5ab8ed6f58814
Component: engine
2015-12-07 16:04:42 -08:00
3291c35ddf Merge pull request #18108 from phemmer/no-mtu-discovery
don't try to use default route MTU as container MTU
Upstream-commit: b36b4920399cc95e1b357f60aa738e84bd970f47
Component: engine
2015-12-08 00:26:29 +01:00
f20b52f333 don't try to use default route MTU as bridge MTU
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: fd9d7c02fcc8edd73d056f56f17e5cfe1760495b
Component: engine
2015-12-07 17:32:51 -05:00
38a3ce820e Merge pull request #18476 from aaronlehmann/v1-push-size
Use DiffSize instead of Size in v1 push
Upstream-commit: 1f0886a71338339d6917953c5efb729f7491aa08
Component: engine
2015-12-07 14:09:14 -08:00
9fbd61f90d 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>
Upstream-commit: 7ab0f9bf6142b828ac8972fae6cb8aabcaf1d742
Component: engine
2015-12-07 13:26:30 -08:00
8b7a15edb7 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>
Upstream-commit: 741924384ee7a617af1a0275e2dc674e86b9d0d9
Component: engine
2015-12-07 11:30:05 -08:00
d76bf17816 Merge pull request #18442 from MHBauer/move-configs
move configs structs to remove dependency on deamon
Upstream-commit: 41ae615aa13508b8f8958dc1c338fce5bccb8e6b
Component: engine
2015-12-07 13:38:43 -05:00
b12523fdf4 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>
Upstream-commit: 63fb931a0b7298c6281898bcc5f53ab0655ad1a6
Component: engine
2015-12-07 09:03:25 -08:00
57ef1043ab Merge pull request #18449 from coolljt0725/plugins_cleanup
pkg/plugins/client.go: don't try to encode os decode if it's nil
Upstream-commit: 5f1af8da5bd824010d3c744d3adf23106f22c6a9
Component: engine
2015-12-07 16:03:28 +01:00
ecc37f59d7 Merge pull request #18451 from WeiZhang555/net-err
Better error message for network connect
Upstream-commit: 7d6a2e3cf5d172c21c831c3466e30d693e12e6fd
Component: engine
2015-12-07 09:17:48 -05:00
1af1c81aab Merge pull request #18123 from aidanhs/aphs-fail-on-broken-tar
Ensure adding a broken tar doesn't silently fail
Upstream-commit: 1f8efc687cdf8ba98a7332cf9d4401afb8108be6
Component: engine
2015-12-07 14:38:21 +01:00
76e21ed7ad Merge pull request #18463 from haoshuwei/modify-containerinspect-tocheckstatuscode
Modify docker inspect client to check statusCode instead of strings c…
Upstream-commit: 2ecbc9774b0b942b5314faa60b566039f31ba90b
Component: engine
2015-12-07 07:55:26 -05:00
c2790f1174 Merge pull request #18425 from wenchma/18424-ErrorCodeNoSuchContainer
Correct the message of ErrorCodeNoSuchContainer to "No such container"
Upstream-commit: 0bb4f82d2d9f3d741fea6251dc4b2925576a8d02
Component: engine
2015-12-07 07:48:04 -05:00
485362d5ea Merge pull request #18468 from iGusev/patch-1
added rm flag to backup/restore commands in examples
Upstream-commit: ce7ae7868e12dcb331c4e427630bf9615c959055
Component: engine
2015-12-07 13:38:16 +01:00
eed34f5bb0 Merge pull request #18105 from mishak87/registry-improvements
Registry tiny code improvements
Upstream-commit: f7c0d0ec5041ae32830a1edb79dfec55cba7b261
Component: engine
2015-12-07 13:35:02 +01:00
2079ca7585 Update dockervolumes.md
added rm flag to backup/restore commands in examples

Signed-off-by: Ilya Gusev <mail@igusev.ru>
Upstream-commit: 8923c30b4ad304b8ff285afae77bc70b1a2036cc
Component: engine
2015-12-07 15:20:10 +03:00
88c160568e Merge pull request #18462 from haoshuwei/modify-networkinspect-tocheckstatuscode
Modify docker network inspect client to check statusCode instead of s…
Upstream-commit: 6fcd33b576bb59e17f8d14f1f96e2dc180052ddb
Component: engine
2015-12-07 12:48:41 +01:00
dce7992408 Merge pull request #18329 from liusdu/mount_err
Fix rm container error in aufs and devicemapper after daemon crash
Upstream-commit: ba77a5b46fb86f6765fdab8a85f82266e1032efe
Component: engine
2015-12-07 12:47:52 +01:00
bcccc8a2e2 Modify docker network inspect client to check statusCode instead of string contain
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
Upstream-commit: 6306eb3cd320bed914104cfd7110fe0aac2c3e4f
Component: engine
2015-12-07 10:11:46 +00:00
ab0fd6f0f5 Modufy docker inspect client to check statusCode instead of strings contains
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com>
Upstream-commit: e719c9225cb4dd6e415c06f6fa4f625a87bfc861
Component: engine
2015-12-07 10:03:46 +00:00