Commit Graph

20398 Commits

Author SHA1 Message Date
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
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
e5e9f03639 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>
Upstream-commit: 8edb941b796cbdd2c9f3809a3290fcd4d8ae76ea
Component: engine
2015-12-07 17:39:13 +08:00
495515514d Merge pull request #18458 from vdemeester/fix-volume-test
Fix DockerSuite.TestVolumeCliInspectMulti
Upstream-commit: 91657008f245f972f3bc44819ae67d31af8f81fe
Component: engine
2015-12-07 10:26:18 +01:00
3247a95872 Fix DockerSuite.TestVolumeCliInspectMulti
Use dockerCmdWithError now that it actually returns an error code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d125ddaeda6b99d5c2c5920664a7e3baa9fb8d92
Component: engine
2015-12-07 08:34:18 +01:00
7d47ab6c34 Merge pull request #18460 from thaJeztah/fix-pull-by-digest
docs: fix pull by digest example
Upstream-commit: 78d8df73b578cbb35595fda062e7735d839617bd
Component: engine
2015-12-06 18:08:51 -06:00
fde8f24281 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>
Upstream-commit: f27572312fd363bcfe43a1ce71c7d225620302ac
Component: engine
2015-12-07 00:58:46 +01:00
af8a444481 Merge pull request #18454 from dcylabs/master
added albatros library
Upstream-commit: 6b8d8bfbf8f3125187f677d55cad7587dd070b27
Component: engine
2015-12-06 15:01:55 -06:00
4769eb1560 added albatros library
Signed-off-by: dcylabs <dcylabs@gmail.com>
Upstream-commit: a94bede2aa04bbb4f05fcda70f8edfa7917a3238
Component: engine
2015-12-06 20:40:42 +01:00
26496961f2 Merge pull request #17741 from dhiltgen/pull_token
Add token pass-thru for AuthConfig
Upstream-commit: 715f6a135c6787fdb6834a6d167b3adc06943afe
Component: engine
2015-12-06 16:40:06 +01:00
b461d8e9fc Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api
Remove CLI specific information for API error messages. Issue #17147
Upstream-commit: 32f08e06e635adac43cd7113e8118394eeafc0b6
Component: engine
2015-12-06 16:02:40 +01:00
d6d57d5554 Merge pull request #17788 from haoshuwei/modify-volume-inspect-multi
Modify docker volume inspect to return existed volumes and the names of the unexsited volumes
Upstream-commit: 5b4734aaa543243ba076bf606286bbc46fed9e38
Component: engine
2015-12-06 14:03:46 +01:00
c0c8958c4e Merge pull request #18446 from LK4D4/vendor_pkg_dockerignore
Add vendor/pkg to .dockerignore
Upstream-commit: b98577af83100ac91e94deba50093f9e0aedad93
Component: engine
2015-12-05 10:06:52 -08:00
ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
8cfbba86b8 Merge pull request #18450 from runcom/typo-ocd
integration-cli: fix test name typo
Upstream-commit: 540c60797283545489193b533c1da93b738ee1bd
Component: engine
2015-12-05 09:15:51 -05:00
8c68850665 integration-cli: fix test name typo
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 09c4643ce1e9c0ae29e0489daefe0053aeed260f
Component: engine
2015-12-05 11:42:46 +01:00
54d257ee92 pkg/plugins/client.go: don't try to encode os decode if it's nil
When user call the `Call()` method, they don't always want to sent
some args or get the return value, so they use `nil` when call `Call()`
method and this will casue an error. It's better to not trying to
encode or decode if it's nil.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a2d348968fe754df41d0a1b56c7ba29ebbaa6849
Component: engine
2015-12-05 02:55:50 -05:00
de4815997a Add vendor/pkg to .dockerignore
It's in .gitignore too, so why not

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9c8d6edbf15a33045cffb37b6406715dc8776675
Component: engine
2015-12-04 17:03:24 -08:00
43099d9c25 Merge pull request #18418 from aaronlehmann/no-head-requests
Avoid a HEAD request for each layer in a v2 pull
Upstream-commit: 82c47088db8a0b460df81e5c2c7a099989ba48b8
Component: engine
2015-12-04 14:51:54 -08:00
a271500de6 Merge pull request #18443 from tonistiigi/fix-images-delete
Fix image deletion conflicts with search
Upstream-commit: a4817b8b2143556c7b656c314fbcda6d5603bf2f
Component: engine
2015-12-04 14:49:18 -08:00
aedf5127c5 Fix image deletion conflicts with search
Removed images were not cleaned up from the
digest-set that is used for the search index.

Fixes #18437

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fcb083c6ac0fdb71e8db7a58f07a561342d631d3
Component: engine
2015-12-04 13:15:54 -08:00
339236ffdf Merge pull request #18408 from tonistiigi/disable-systemd-timeout
Disable timeout for systemd
Upstream-commit: 23f00624a174dce985615ba4438303039b16dd09
Component: engine
2015-12-04 12:34:19 -08:00
fee5b92987 Merge pull request #18436 from estesp/fix-initlayer-perms
Fix init layer chown of existing dir ownership
Upstream-commit: a56f258c8af4524f00750fbaa92d7b1f85981cef
Component: engine
2015-12-04 11:53:09 -08:00
d7dafeedd3 Merge pull request #18398 from calavera/system_backend
Move docker system information to a dedicated router and backend.
Upstream-commit: 51b0f23127f115ce24b45dac2d565db58d25458e
Component: engine
2015-12-04 12:56:57 -05:00
3e1a2d1f77 Avoid a HEAD request for each layer in a v2 pull
We were calling Stat for each layer to get the size so we could indicate
progress, but https://github.com/docker/distribution/pull/1226 made it
possible to get the length from the GET request that Open initiates.

Saving one round-trip per layer should make pull operations slightly
faster and more robust.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 39589800b4750bf28078efe57f7f1e74d971248f
Component: engine
2015-12-04 09:32:16 -08:00
355bde6b1b Merge pull request #18404 from jfrazelle/cleanup-maintainers
cleanup people in maintainers file
Upstream-commit: e29f208547220c3c31abb2f8fd36d9e1ea70ec05
Component: engine
2015-12-04 09:25:43 -08:00
37ebaba7a1 Fix init layer chown of existing dir ownership
This solves a bug where /etc may have pre-existing permissions from
build time, but init layer setup (reworked for user namespaces) was
assuming root ownership.  Adds a test as well to catch this situation in
the future.

Minor fix to wrong ordering of chown/close on files created during the
same initlayer setup.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 23b771782ab7236ce5024ac5773a6ded9a2af753
Component: engine
2015-12-04 12:18:05 -05:00
cb5428fd49 Merge pull request #18434 from haugene/master
docs: fix typo in bash_history mount example
Upstream-commit: 5a9bf3a3d38043b88ae137ff388001a690cc94f0
Component: engine
2015-12-04 16:15:36 +01:00
d0e41cba7f docs: fix typo in bash_history mount example
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
Upstream-commit: 655766ed955477299fac95a0fcd60af58f2b5be8
Component: engine
2015-12-04 16:09:25 +01:00
13df21d3ec Merge pull request #18325 from RsrchBoy/topic/newtorks
newtork -> network (minor spelling correction)
Upstream-commit: e3fbd6922fe549755890a205a0b8dd88022d5924
Component: engine
2015-12-04 14:03:55 +01:00
9e539c7be0 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
99997548a7 Merge pull request #18384 from Mashimiao/weight-device-docs-fix
docs: fix blkio-weight-device option args
Upstream-commit: 605c56295fffdf3658d0f6c8faa1b0de03e50e37
Component: engine
2015-12-04 12:04:23 +01:00
cae2a5b6ac Correct the message of ErrorCodeNoSuchContainer to "No such container"
Fixes issue #18424

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: c424c8c32c86d5e02964ad84802e9f9fa4e55522
Component: engine
2015-12-04 15:00:08 +08:00
6790de2194 Merge pull request #18412 from aaronlehmann/runcommand-race
Fix race in RunCommandWithOutputForDuration
Upstream-commit: 7c1c96551d41e369a588e365a9bb99acb5bc8fdb
Component: engine
2015-12-03 19:35:04 -08:00
07663b4b7e Merge pull request #18413 from jfrazelle/update-go-version
update go version
Upstream-commit: a65502f7513b6695d18a68785080192454ef9236
Component: engine
2015-12-03 18:18:47 -08:00
448be2245f Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
Vendor distribution and fix inspect by sha256 prefix
Upstream-commit: c80d03db77d1bb70f85b3d765221bf7206714344
Component: engine
2015-12-03 20:59:47 -05:00
d5560ff674 docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
7be0f9667b Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
1c9031a8a0 update go version
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b7b707af2e617d62343391c6c82b984ff41b08e2
Component: engine
2015-12-03 16:37:13 -08:00