1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

35546 commits

Author SHA1 Message Date
Derek McGowan
98e23f2a8e
Update containerd vendor to 1.2 beta
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-17 13:08:22 -07:00
Yong Tang
f57f260b49
Merge pull request from thaJeztah/bump_swarmkit
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
2018-08-05 09:11:58 -07:00
Sebastiaan van Stijn
eeea12db7a
Merge pull request from Microsoft/jjh.37562
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
2018-08-03 22:05:06 +02:00
Sebastiaan van Stijn
660fa129c0
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Relevant changes;

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-03 18:55:53 +02:00
John Howard
5cfededc7c Don't invoke HCS shutdown if terminate called
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-08-02 16:29:37 -07:00
Sebastiaan van Stijn
75fe414440
Merge pull request from yongtang/07282018-ipc-container
Migrate some ipc container test from integration-cli to integration
2018-08-02 15:51:25 +02:00
Yong Tang
80c92c9b69 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>
2018-08-01 21:51:45 +00:00
Sebastiaan van Stijn
09f5e9dae3
Merge pull request from Russtopia/master
namesgenerator: new adjective, two inspiring Computing Science authors
2018-08-01 23:50:05 +02:00
Tibor Vass
724c5f317e
Merge pull request from poizan42/fix-mips-no-pie
-buildmode=pie is not supported on Linux on MIPS either
2018-08-01 10:39:55 -07:00
Sebastiaan van Stijn
e1584514c1
Merge pull request from fcrisciani/resolv
Systemd-resolved proper handling
2018-08-01 14:52:33 +02:00
Vincent Demeester
1dfcf4fe77
Merge pull request from vdemeester/bump-some-deps
Bump a bunch of dependencies to more recent versions
2018-08-01 13:45:30 +02:00
Sebastiaan van Stijn
27f663a253
Merge pull request from thaJeztah/windows-rs3-ci
Temporarily disable failing tests on Windows RS3
2018-08-01 12:16:12 +02:00
Vincent Demeester
b0d108aa6b
Bump a bunch of dependencies to more recent versions
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-01 10:37:27 +02:00
Vincent Demeester
9149ef67be
Merge pull request from adshmh/fix-flaky-test-TestRunContainerWithBridgeNone
fix the race condition in the integration test TestRunContainerWithBridgeNone
2018-08-01 09:57:29 +02:00
John Stephens
1b05ea4727
Temporarily disable failing tests on Windows RS3
Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-31 23:49:36 +02:00
Russ Magee
72a5e621e5 Added additional scientists for balance per names-generator.go policy
Signed-off-by: Russ Magee <rmagee@gmail.com>
2018-07-31 11:34:56 -07:00
Brian Goff
562df8c2d6
Merge pull request from AkihiroSuda/hijack-dialer
client: add WithDialContext() and client.Dialer()
2018-07-31 10:49:27 -07:00
Vincent Demeester
62739828d0
Merge pull request from kolyshkin/typpo
loggerutils: fix a typo
2018-07-31 18:57:18 +02:00
Kir Kolyshkin
2c6fbd864a loggerutils: fix a typo
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-07-31 15:44:46 +03:00
Sebastiaan van Stijn
9cf8feebbf
Merge pull request from vdemeester/bump-mergo
Bump mergo to v0.3.6
2018-07-31 13:10:13 +02:00
Kasper Fabæch Brandt
daba5daf4f -buildmode=pie is not supported on Linux on MIPS either
Signed-off-by: Kasper Fabæch Brandt <poizan@poizan.dk>
2018-07-31 13:02:01 +02:00
Vincent Demeester
a550b0ae47
Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-31 10:03:43 +02:00
Sebastiaan van Stijn
73d73ba962
Merge pull request from Snorch/do_not_lose_error_message
Don not lose an error message from d.StartWithError in d.Start
2018-07-30 13:20:01 +02:00
Sebastiaan van Stijn
7b46fbc17a
Merge pull request from cwgem/37453_slash_prefix_removal
Remove slash prefix when matching name filters (Fixes )
2018-07-30 13:17:40 +02:00
Pavel Tikhomirov
2ed53943f3
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>
2018-07-30 10:33:03 +02:00
Sebastiaan van Stijn
b9bb3bae51
Merge pull request from kolyshkin/int-msg
integration: fix log message
2018-07-30 10:31:29 +02:00
Sebastiaan van Stijn
0211de67ab
Merge pull request from Quasilyte/quasilyte/fixErrorReturn
pkg/system: return nil explicitly
2018-07-30 10:22:51 +02:00
Iskander Sharipov
cda9d5f7f0 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>
2018-07-29 01:31:08 +03:00
Akihiro Suda
edac92409a 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>
2018-07-28 23:35:47 +09:00
Sebastiaan van Stijn
b785a4dcb6
Merge pull request from vdemeester/revert-flaky-tests
Revert "migrated service integration tests from integration-cli/docke…
2018-07-28 12:34:15 +01:00
Sebastiaan van Stijn
13a8031e1c
Merge pull request from jterry75/linux_metadata
Adds LinuxMetadata support by default on Windows
2018-07-27 17:51:10 +01:00
Vincent Demeester
c2e3657b17
Revert "migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service"
This reverts commit fbaef1b0d3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-27 17:35:52 +02:00
Kir Kolyshkin
2c2834ba4d integration: fix log message
The message was mistakenly replaced with a completely different one.

Fixes: cf2ea76138

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-07-27 11:47:59 +03:00
Yong Tang
3f4410163b
Merge pull request from adshmh/migrate-docker_cli_service_update_test-to-integration-service
migrate service update integration tests from integration-cli to integration/service package
2018-07-26 22:48:19 -07:00
Flavio Crisciani
fc4ebe0b8b
Vendor libnetwork
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-07-26 11:17:56 -07:00
Flavio Crisciani
e353e7e3f0
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>
2018-07-26 11:17:56 -07:00
Flavio Crisciani
0fc52ca6dd
Add a way to get a pid of a process
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-07-26 11:17:46 -07:00
Sebastiaan van Stijn
c3a0207714
Merge pull request from bjbroder/checkpoint-exit
Fix checkpoint's exiting semantics.
2018-07-26 14:25:49 +02:00
Yong Tang
8239526f17
Merge pull request from dmcgowan/disable-cri
Add configuration option for cri-containerd
2018-07-25 15:44:37 -07:00
Sebastiaan van Stijn
6f8d85c441
Merge pull request from Microsoft/jjh/revendoropengcs
Revendor Microsoft/opengcs @ v0.3.8
2018-07-25 23:41:10 +02:00
Arash Deshmeh
fbaef1b0d3 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>
2018-07-25 14:49:02 -04:00
Brielle Broder
db621eb7ee
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>
2018-07-25 09:21:33 +02:00
Derek McGowan
8fb5f4d5c9
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>
2018-07-24 11:34:47 -07:00
John Howard (VM)
25aaf9772b Revendor Microsoft/opengcs @ v0.3.8
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
2018-07-23 10:45:24 -07:00
Justin Terry (VM)
e93077bcdf 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>
2018-07-23 09:59:35 -07:00
Sebastiaan van Stijn
1ef1cc8388
Merge pull request from kolyshkin/tarsum
pkg/tarsum: fix unit test for Go 1.11+
2018-07-21 10:51:48 +02:00
Sebastiaan van Stijn
683738900e
Merge pull request from kolyshkin/ct-go-111
vendor: bump google/certificate-transparency-go to 1.0.20
2018-07-19 14:06:07 +02:00
Sebastiaan van Stijn
24711b7eba
Merge pull request from kolyshkin/osusergo
Add osusergo build tar for static binaries
2018-07-19 13:57:44 +02:00
Kir Kolyshkin
70cdb1c664 Add osusergo build tar for static binaries
Go 1.11 includes a fix to os/user to be working in a static binary
(fixing https://github.com/golang/go/issues/23265). The fix requires
`osusergo` build tag to be set for static binaries, which is what
this commit adds (also for containerd).

[v2: sort build tags alphabetically]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-07-19 12:25:46 +03:00
Kir Kolyshkin
dacefc32b2 vendor: bump google/certificate-transparency-go to 1.0.20
This is to include the Windows + Go1.11 fix
(https://github.com/google/certificate-transparency-go/issues/284).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-07-19 10:47:53 +03:00