47fdbea6d3
Merge component 'engine' from git@github.com:moby/moby master
2017-12-04 06:57:00 +00:00
bf78150b9b
Merge pull request #35600 from nictuku/go_option
...
Set a go_package on api/types/swarm/runtime to make it Bazel compatible
Upstream-commit: 7ef9266ba090a3230355c39352dddf41aeb5b726
Component: engine
2017-12-01 17:30:12 -08:00
5016fee3dc
Merge pull request #35578 from thaJeztah/fix-portbindings-swagger
...
Fix PortBindings definition in Swagger
Upstream-commit: ac68411f85a1c4540c0d4f5b7db86b0b0422f025
Component: engine
2017-12-01 17:46:38 -05:00
9a7838eb22
Merge pull request #35422 from pradipd/lbfix
...
Move load balancer sandbox creation/deletion into libnetwork
Upstream-commit: 4bb2c2402df88f0e3e8c47499fc2de5182719e00
Component: engine
2017-12-01 14:08:48 -08:00
6a8cf843af
Merge component 'engine' from git@github.com:moby/moby master
2017-12-01 04:12:05 +00:00
5f26edda74
Merge component 'cli' from git@github.com:docker/cli master
2017-12-01 03:52:40 +00:00
b611814dc6
Merge pull request #35628 from ikarpovich/35626-le-line-only-legacy
...
Logentries line-only logopt fix to maintain backwards compatibility
Upstream-commit: 3a9ab941adcc7a39c3ea8c52e3c215cdddb2fe67
Component: engine
2017-11-30 15:48:56 -08:00
f67476ad43
Merge pull request #35645 from crosbymichael/ctd-10
...
Update containerd to pre-1.0 rc commit
Upstream-commit: 3eb7314519714e0392a4863d6cd4beb3a4b206e8
Component: engine
2017-11-30 15:22:01 -08:00
b8226cb988
Adding test for creating service multiple times.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 791d88b8538b4949153d346ec738139aa6d15280
Component: engine
2017-11-30 13:03:44 -08:00
19fca6eb66
docker changes corresponding to libnetwork changes.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 41071d6648fe5b4649354e806543b9520af45383
Component: engine
2017-11-30 13:03:30 -08:00
553ad48935
vndr libnetwork 64ae58878fc8f95e4a167499d654e13fa36abdc7
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 7de313ac4ec2084aca6c91efc3124b9dbffc5f1a
Component: engine
2017-11-30 13:02:56 -08:00
a8cf119f39
Merge pull request #35516 from mlaventure/reduce-race-on-exit
...
Add missing lock in ProcessEvent
Upstream-commit: 9d00efb533d3561220d169a86ca9ff965f9a6b2c
Component: engine
2017-11-30 11:30:51 -08:00
4d4ec05575
Merge pull request #35533 from AliyunContainerService/supress-warning-healthcheck-none
...
Suppress warning when NONE was set for healthcheck
Upstream-commit: 29d6aef3930bf2ba815e27f4507f035a7fb5ba6c
Component: engine
2017-11-30 11:06:05 -08:00
a620b9f6fd
Merge pull request #35496 from cpuguy83/add_timeouts_to_splunk_post
...
Set timeout on splunk batch send
Upstream-commit: 88e36dcc76c08d13fd83f91fa7dbe4a6ff4c83b8
Component: engine
2017-11-30 09:47:48 -08:00
4a8c6447a6
Merge pull request #719 from vdemeester/test-secret-config-indempotence
...
Add unit tests on config/secret indempotence in stack deploy
Upstream-commit: 6b63d7b96a
2017-11-30 08:39:56 -08:00
87f648cd90
Merge pull request #35618 from kolyshkin/mkdir-all
...
Fix MkdirAll* and its usage
Upstream-commit: 72e45fd54e13256c813fdb39b18e26a0de980733
Component: engine
2017-11-30 11:19:29 -05:00
9d718a77b7
Merge pull request #35614 from mlaventure/remove-exec-bypid
...
Remove ByPid from ExecCommands
Upstream-commit: edbf7d8ed41a88d34dd9ad249ac94f095e0d3385
Component: engine
2017-11-30 11:17:42 -05:00
d99ad61b69
Update containerd to 6bff39c643886dfa3d546e83a90a5
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c2cb302d1701e0de35930671f61e5d267fcb3e01
Component: engine
2017-11-30 11:16:25 -05:00
ad76847e4b
Update daemon code for containerd API changes
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: aa3ce07c41e0da9331f0659f28fed7f35846556c
Component: engine
2017-11-30 09:55:03 -05:00
c4cb5e12ad
Logentries line-only logopt fix to maintain backwards compatibility
...
Changed logic to ignore empty value
Fixes #35626
Signed-off-by: Igor Karpovich <igor@karpovich.me >
Upstream-commit: 27a5b878c149fd70ca1e0beebda58edcc19abc73
Component: engine
2017-11-30 13:03:16 +00:00
9818aadf77
Add unit tests on config/secret indempotence in stack deploy
...
Related PR : https://github.com/docker/cli/pull/509
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5ed399e588
2017-11-30 09:45:32 +01:00
617fb8ceb7
Merge pull request #702 from albers/completion-log--until
...
Add bash completion for `logs --until`
Upstream-commit: b45a49c83f
2017-11-30 09:40:08 +01:00
a88b24bfeb
Merge pull request #35483 from thaJeztah/disallow-nfs-backing-for-overlay
...
Disallow overlay/overlay2 on top of NFS
Upstream-commit: bdd9668b489c65eb1ef7272d38ad877ffda2041c
Component: engine
2017-11-29 19:24:58 -08:00
1072fa08f7
Merge pull request #35634 from fcrisciani/fix-net-not-found
...
Restore error type in FindNetwork
Upstream-commit: e0b3ddd4377b9539e6112e57777f4c7b1d0bfc08
Component: engine
2017-11-29 16:26:26 -08:00
d9f34cfcb3
Update containerd to 59bd1967112885c4d49e510e55701
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5bd902b5cfbb360915b02fc2a787ae9e1c183405
Component: engine
2017-11-29 19:15:14 -05:00
3e4063cddb
Merge pull request #35501 from cpuguy83/lock_while_stopping_healthcheck
...
Fix some issues with locking on the container
Upstream-commit: 3d80a692d146e10282bacc0dd2698ffd32dcdaae
Component: engine
2017-11-30 09:01:31 +09:00
006ed302fe
Merge pull request #35527 from thaJeztah/feature-detect-overlay2
...
Detect overlay2 support on pre-4.0 kernels
Upstream-commit: 11e07e7da6023b872788b1e05f83e147f0984fb2
Component: engine
2017-11-29 13:51:26 -08:00
02055337d8
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
Upstream-commit: d921d5cc39
2017-11-29 11:33:53 -08:00
ea17d4a2f5
Restore error type in FindNetwork
...
The error type libnetwork.ErrNoSuchNetwork is used in the controller
to retry the network creation as a managed network though the manager.
The change of the type was breaking the logic causing the network to
not being created anymore so that no new container on that network
was able to be launched
Added unit test
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 51cea0a53c2fd36832277402e9faac81bfb4abd4
Component: engine
2017-11-29 11:22:57 -08:00
f8c7f6621d
Use default inspect formatting, remove omitempty, update docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a9428285f0
2017-11-29 10:52:35 -08:00
b1e7ee7a82
support multiple arguments to trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 1eb87cc096
2017-11-29 10:52:34 -08:00
7e9b53fd42
add docker trust inspect command for JSON viewing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: cd38d39d0d
2017-11-29 10:52:34 -08:00
9b7953e812
Merge pull request #718 from dnephin/fix-e2e-docker-build
...
Fix e2e build test
Upstream-commit: 1b4f2d3b73
2017-11-29 10:30:31 -08:00
a79583a886
Merge pull request #677 from albers/completion-log-opts
...
Add new log driver options to bash completion
Upstream-commit: 4f009541cb
2017-11-29 10:01:19 -08:00
fe41a825e2
Merge pull request #678 from albers/completion-build--stream
...
Add bash completion for experimental `build --stream`
Upstream-commit: c428561b63
2017-11-29 10:00:23 -08:00
264f9d5a4f
Merge pull request #701 from albers/completion-trust-sign--local
...
Add bash completion for `trust sign --local`
Upstream-commit: e5d49c0199
2017-11-29 09:44:53 -08:00
40b8aa0152
Merge pull request #467 from estesp/chown-flag-docs
...
Add docs for Dockerfile ADD/COPY --chown flag
Upstream-commit: 12765c318f
2017-11-29 09:28:30 -08:00
29f2890225
Fix e2e build test
...
The build output changed in 17.11
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 16cd84024c
2017-11-29 11:02:40 -05:00
cbde088d23
Merge pull request #716 from vdemeester/bump-go
...
Bump Go to 1.9.2
Upstream-commit: 8abb266043
2017-11-29 09:42:58 -05:00
1433c3b1eb
Bump Go to 1.9.2
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6859a7387b
2017-11-29 09:16:03 +01:00
5a1411dbf0
Merge pull request #35606 from cbirajdar/master
...
added more awesome and notable women to names-generator.go
Upstream-commit: c8441b186e8bc5d7994a922782cc3b6e2c462893
Component: engine
2017-11-28 21:37:17 -08:00
1901e3d893
Merge pull request #35619 from Microsoft/jjh/testrunservicingcontainer
...
Disable TestRunServicingContainer on RS4+ builds
Upstream-commit: 99e4eb103d67422ff10809079e2b810cd3dfce99
Component: engine
2017-11-28 21:34:15 -08:00
856222b133
Merge pull request #35620 from fcrisciani/libnetwork-vendoring
...
Libnetwork vendoring
Upstream-commit: 235c10573612d856300ffeb5c05ac0ca343609a6
Component: engine
2017-11-28 21:11:14 -08:00
bac9dc2670
Merge pull request #35631 from Microsoft/jjh/heightwidth
...
Windows: Fix width/height swap
Upstream-commit: 29708da9077fc37554bac10b17fe0446bed07af9
Component: engine
2017-11-28 21:02:46 -08:00
87cfb875f7
Merge pull request #34948 from euank/public-mounts
...
Fix EBUSY errors under overlayfs and v4.13+ kernels
Upstream-commit: 09eb7bcc3624f5bd70135d6d24021b40c1095b46
Component: engine
2017-11-29 12:48:39 +09:00
a0c42a8dee
Merge pull request #35622 from asottile/update_integration_cli_docs
...
Change references from test-integration-cli to test-integration
Upstream-commit: debc1fbee8d86948deed5939bb73f2a175151fb1
Component: engine
2017-11-29 12:47:52 +09:00
7f2221039e
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-11-28 18:03:52 -08:00
6be246bf8b
Merge component 'engine' from git@github.com:moby/moby master
2017-11-28 18:03:40 -08:00
67203bb69e
Merge pull request #429 from RenaudWasTaken/generic-resource
...
Integrated Generic resource in service create
Upstream-commit: 97b148b440
2017-11-28 18:01:42 -08:00
99c53b25ef
Merge component 'cli' from git@github.com:docker/cli master
2017-11-28 17:01:27 -08:00
