Commit Graph

33523 Commits

Author SHA1 Message Date
e5b37c1dc8 Add new local log driver
This driver uses protobuf to store log messages and has better defaults
for log file handling (e.g. compression and file rotation enabled by
default).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a351b38e7217af059eb2f8fc3dba14dc03836a45
Component: engine
2018-08-17 09:36:56 -07:00
feccebcffe Decouple logfile from tailfile.
This makes it so consumers of `LogFile` should pass in how to get an
io.Reader to the requested number of lines to tail.

This is also much more efficient when tailing a large number of lines.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 94a10150f64a24793216f5324a34e62be3f31a2d
Component: engine
2018-08-10 21:02:19 -07:00
2835149d80 Add func to get an io.Reader for tail operations
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 874867d4e575ef805d71759e703e4f11cce05bd3
Component: engine
2018-08-10 21:01:15 -07:00
be5744ef79 Add partial log metadata to log driver proto
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e78ec2aab69068074038ee01bc89b75254a044b7
Component: engine
2018-08-10 20:44:30 -07:00
b552588bbc Merge pull request #37609 from seratch/fix-typos
Fix the several typos detected by github.com/client9/misspell
Upstream-commit: 4122eb1a43a42c4c8b827b4d0fb3d6543f9f2c91
Component: engine
2018-08-09 08:48:05 +09:00
71cb67c2af Merge pull request #37582 from andrewhsu/bk
vndr containerd to a88b631, buildkit to e57eed4, and fsutil to b19464c
Upstream-commit: a3e78ca0c6a1a20c5ffeeaa51e3e0b4ff623a464
Component: engine
2018-08-08 10:55:19 -07:00
71a3e53c36 Fix the several typos detected by github.com/client9/misspell
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
2018-08-09 00:45:00 +09:00
a3a5617ab6 builder: fix compilation errors after vendoring
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
2018-08-07 06:03:10 +00:00
c811febb3c Merge pull request #37586 from thaJeztah/bump_swarmkit
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Upstream-commit: f57f260b49b6142366e6bc1274204ee0a1205945
Component: engine
2018-08-05 09:11:58 -07:00
baf9cf6d1a Merge pull request #37583 from Microsoft/jjh.37562
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
Upstream-commit: eeea12db7a65e6ad633747e49928c80b0f18d86b
Component: engine
2018-08-03 22:05:06 +02:00
a972373b51 Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Relevant changes;

- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
2018-08-03 18:55:53 +02:00
295ddc5339 Don't invoke HCS shutdown if terminate called
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5cfededc7ca552260f8eb7319184437a816e480d
Component: engine
2018-08-02 16:29:37 -07:00
4658043fcf vndr buildkit to e57eed4 and fsutil to b19464c
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 67da8c84b66a79261032478637b26c5baa3908b4
Component: engine
2018-08-02 18:19:13 +00:00
a055aa9d40 Migrate some ipc container test from integration-cli to integration
This fix migrates some ipc container tests from integration-cli
to integration test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 80c92c9b692b79273200b6e37f14a6d4e984ab8d
Component: engine
2018-08-01 21:51:45 +00:00
f4ebc73a60 Merge pull request #37465 from Russtopia/master
namesgenerator: new adjective, two inspiring Computing Science authors
Upstream-commit: 09f5e9dae3b83ee9eaa09b8097134d5d4251fce8
Component: engine
2018-08-01 23:50:05 +02:00
1e5cba450a Merge pull request #37489 from poizan42/fix-mips-no-pie
-buildmode=pie is not supported on Linux on MIPS either
Upstream-commit: 724c5f317e0aabb3fb95933e5dd95ab9d71b5cdb
Component: engine
2018-08-01 10:39:55 -07:00
b6bdcc10a5 Merge pull request #37485 from fcrisciani/resolv
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
2018-08-01 14:52:33 +02:00
1e6a95f11f Merge pull request #37522 from vdemeester/bump-some-deps
Bump a bunch of dependencies to more recent versions
Upstream-commit: 1dfcf4fe77e47d740939271aea516e11b5f9bcba
Component: engine
2018-08-01 13:45:30 +02:00
5483ae0078 Merge pull request #37573 from thaJeztah/windows-rs3-ci
Temporarily disable failing tests on Windows RS3
Upstream-commit: 27f663a2532bb1b4c7fc375f8597d08064ce1890
Component: engine
2018-08-01 12:16:12 +02:00
14dcb25448 Bump a bunch of dependencies to more recent versions
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
2018-08-01 10:37:27 +02:00
546812f824 Merge pull request #37438 from adshmh/fix-flaky-test-TestRunContainerWithBridgeNone
fix the race condition in the integration test TestRunContainerWithBridgeNone
Upstream-commit: 9149ef67be8ac945d68fafb16a1aa4ccb2f72249
Component: engine
2018-08-01 09:57:29 +02:00
ef87b4e0a0 Temporarily disable failing tests on Windows RS3
Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1b05ea472703ddc47ec5052bc031fc23e60356c4
Component: engine
2018-07-31 23:49:36 +02:00
97d44663f5 Added additional scientists for balance per names-generator.go policy
Signed-off-by: Russ Magee <rmagee@gmail.com>
Upstream-commit: 72a5e621e574aae8d374559867bf8a5c17d2387b
Component: engine
2018-07-31 11:34:56 -07:00
de583a8acb Merge pull request #36630 from AkihiroSuda/hijack-dialer
client: add WithDialContext() and client.Dialer()
Upstream-commit: 562df8c2d6f48601c8d1df7256389569d25c0bf1
Component: engine
2018-07-31 10:49:27 -07:00
a8fa741f70 loggerutils: fix a typo
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 2c6fbd864ae089e9cb544666949b8b2d897b3b23
Component: engine
2018-07-31 15:44:46 +03:00
63b2aa93fd -buildmode=pie is not supported on Linux on MIPS either
Signed-off-by: Kasper Fabæch Brandt <poizan@poizan.dk>
Upstream-commit: daba5daf4fc76fe530f093125efe094c2dd93e8c
Component: engine
2018-07-31 13:02:01 +02:00
0f058dae99 Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a550b0ae475ebbfcffe92d9bf40734f5b3de2f7e
Component: engine
2018-07-31 10:03:43 +02:00
fca724f301 Merge pull request #37543 from Snorch/do_not_lose_error_message
Don not lose an error message from d.StartWithError in d.Start
Upstream-commit: 73d73ba9622596b9c405f1ac955474804b286be6
Component: engine
2018-07-30 13:20:01 +02:00
3cb14e951e Merge pull request #37462 from cwgem/37453_slash_prefix_removal
Remove slash prefix when matching name filters (Fixes #37453)
Upstream-commit: 7b46fbc17ab991804126588a8dfd09e54ec5902b
Component: engine
2018-07-30 13:17:40 +02:00
0cd2e6ef4a Don not lose an error message from d.StartWithError in d.Start
Else it is harder to understand where we've failed in StartWithLogFile

We have an errror:

[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
[d42ce729d0b06] waiting for daemon to start
docker_cli_userns_test.go:27:
    s.d.StartWithBusybox(c, "--userns-remap", "default")
/go/src/github.com/docker/docker/internal/test/daemon/daemon.go:203:
    t.Fatalf("Error starting daemon with arguments: %v", args)
... Error: Error starting daemon with arguments: [--userns-remap default]

[d42ce729d0b06] exiting daemon

Likely it is "[..] Daemon exited during startup" case, but these error
message is lost

Also we lose the error returned by waiting daemon so also add it

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Upstream-commit: 2ed53943f37c26017260759b12d32cfdd75be152
Component: engine
2018-07-30 10:33:03 +02:00
2525e6162b Merge pull request #37542 from kolyshkin/int-msg
integration: fix log message
Upstream-commit: b9bb3bae5161f931c1dede43c67948c599197f50
Component: engine
2018-07-30 10:31:29 +02:00
2d2f5454b7 pkg/system: return nil explicitly
Makes code less confusing.
Otherwise it looks like an error (typo of "==" instead "!=").

Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
Upstream-commit: cda9d5f7f0c4a155d1ae9e06c203fcb89600ff2a
Component: engine
2018-07-29 01:31:08 +03:00
37b7f3706f client: add WithDialContext() and client.Dialer()
WithDialContext() allows specifying custom dialer for hijacking and supposed to
replace WithDialer().
WithDialer() is also updated to use WithDialContext().

client.Dialer() returns the dialer configured with WithDialContext().

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: edac92409a3b1d0cfb7f5c0e2d10b3bb71f27245
Component: engine
2018-07-28 23:35:47 +09:00
6d2b321997 Merge pull request #37545 from vdemeester/revert-flaky-tests
Revert "migrated service integration tests from integration-cli/docke…
Upstream-commit: b785a4dcb6738ec9d32f30f200c5d9e81876bc01
Component: engine
2018-07-28 12:34:15 +01:00
c3d8713381 Merge pull request #37514 from jterry75/linux_metadata
Adds LinuxMetadata support by default on Windows
Upstream-commit: 13a8031e1c8593e820f20edc713c89dbe65cee3b
Component: engine
2018-07-27 17:51:10 +01:00
82168dfb82 Revert "migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service"
This reverts commit fbaef1b0d3c5656a8aa5f0424b89c118ca277427.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c2e3657b17d8a1fcb80d39e92bdea1a478f82f34
Component: engine
2018-07-27 17:35:52 +02:00
02f7f926ab integration: fix log message
The message was mistakenly replaced with a completely different one.

Fixes: cf2ea7613899477

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 2c2834ba4d59bb1bbb3efee07c8d3f09445c66b7
Component: engine
2018-07-27 11:47:59 +03:00
e27a09f4ba Merge pull request #37492 from adshmh/migrate-docker_cli_service_update_test-to-integration-service
migrate service update integration tests from integration-cli to integration/service package
Upstream-commit: 3f4410163b8bfbfb67fa2730107235f16c6bbe59
Component: engine
2018-07-26 22:48:19 -07:00
d481c9e35d Vendor libnetwork
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: fc4ebe0b8bc5e41b3b2d108c21dc19ea08a9fcb7
Component: engine
2018-07-26 11:17:56 -07:00
1d8c80a782 Fixes for resolv.conf
Handle the case of systemd-resolved, and if in place
use a different resolv.conf source.
Set appropriately the option on libnetwork.
Move unix specific code to container_operation_unix

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: e353e7e3f0ce8eceeff657393cba2876375403fa
Component: engine
2018-07-26 11:17:56 -07:00
1fb6cc9e1e Add a way to get a pid of a process
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 0fc52ca6dd628f2b9163f5d328d1d749c6708de4
Component: engine
2018-07-26 11:17:46 -07:00
38f6818cef Merge pull request #37360 from bjbroder/checkpoint-exit
Fix checkpoint's exiting semantics.
Upstream-commit: c3a02077149ea8ee1d53b2b60a3d36c29d1505f8
Component: engine
2018-07-26 14:25:49 +02:00
0d95964029 Merge pull request #37519 from dmcgowan/disable-cri
Add configuration option for cri-containerd 
Upstream-commit: 8239526f17aacb12f317fcd41501d69f2c1fafc2
Component: engine
2018-07-25 15:44:37 -07:00
7307ff9185 Merge pull request #37515 from Microsoft/jjh/revendoropengcs
Revendor Microsoft/opengcs @ v0.3.8
Upstream-commit: 6f8d85c441be3943eaa82d01430b39b90261d20c
Component: engine
2018-07-25 23:41:10 +02:00
cfcd7a95da migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: fbaef1b0d3c5656a8aa5f0424b89c118ca277427
Component: engine
2018-07-25 14:49:02 -04:00
6817733c2a Fix checkpoint's exiting semantics.
Previously, dockerd would always ask containerd to pass --leave-running
to runc/runsc, ignoring the exit boolean value. Hence, even `docker
checkpoint create --leave-running=false ...` would not stop the
container.

Signed-off-by: Brielle Broder <bbroder@google.com>
Upstream-commit: db621eb7ee6a837f6879959ac56c67fa2b30ae1d
Component: engine
2018-07-25 09:21:33 +02:00
b9ebe2f524 Add configuration option for containerd cri
Disable cri plugin by default in containerd and
allows an option to enable the plugin. This only
has an effect on containerd when supervised by
dockerd. When containerd is managed outside of
dockerd, the configuration is not effected.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 8fb5f4d5c9b4933be31bf5371d65a95edb037261
Component: engine
2018-07-24 11:34:47 -07:00
fd8de2c620 Revendor Microsoft/opengcs @ v0.3.8
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
Upstream-commit: 25aaf9772bbef81ee6557d23f37ac69f988d1050
Component: engine
2018-07-23 10:45:24 -07:00
4ac052187e Adds LinuxMetadata support by default on Windows
1. Sets the LinuxMetadata flag by default on Windows LCOW v1
MappedDirectories.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
Upstream-commit: e93077bcdf77be2e7e3aec9f9686dace9e18c850
Component: engine
2018-07-23 09:59:35 -07:00
19f93d0875 Merge pull request #37498 from kolyshkin/tarsum
pkg/tarsum: fix unit test for Go 1.11+
Upstream-commit: 1ef1cc8388165b2b848f9b3f53ec91c87de09f63
Component: engine
2018-07-21 10:51:48 +02:00