Commit Graph
37584 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 200114130e Merge pull request #33278 from tonistiigi/plugin-chroot
Use chrootarchive for plugin rootfs
Upstream-commit: 6c05ceeb0b483f15b4b7b449db6c3f32a5e30d6b
Component: engine
2017-05-19 02:38:29 +02:00
Sebastiaan van Stijn a41009bb07 Merge pull request #33269 from tophj-ibm/switch-more-syscalls-pkg-term
[pkg/term] switch more syscalls to /x/sys/
Upstream-commit: dd27bbb41a7f98a0beea3d7f39da0dbb53e29ff5
Component: engine
2017-05-19 02:37:52 +02:00
Derek McGowan 10c5371927 Support overlay2 on btrfs
OverlayFS is supported on top of btrfs as of Linux Kernel 4.7.
Skip the hard enforcement when on kernel 4.7 or newer and
respect the kernel check override flag on older kernels.
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: f64a4ad008e68996afcec3ab34a869887716f944
Component: engine
2017-05-18 15:26:03 -07:00
Madhu Venugopal f6ecbd87c6 Vendoring libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
Kenfe-Mickaël Laventure 2d8e76dfbc Merge pull request #33274 from aaronlehmann/update-cli
Update CLI commit hash
Upstream-commit: da9a8854834cb48a8112d8192811d9c41f8be358
Component: engine
2017-05-18 15:11:10 -07:00
Tonis Tiigi 14bb0faf0c Use chrootarchive for plugin rootfs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6f3f907cdba0ba1aa4eb1320595d155bab3467af
Component: engine
2017-05-18 14:53:46 -07:00
Sebastiaan van Stijn 0d783a82c9 Merge pull request #33267 from YuPengZTE/devImageWithDigestString
ineffectual assignment to isCanonical, delete it, and make the "if" sentence to fit the golang usage
Upstream-commit: b0dd3dfc1184b210854b62c231b7b074dd6dbd26
Component: engine
2017-05-18 23:37:52 +02:00
Sebastiaan van Stijn 6b7f9e397d Merge pull request #33250 from cyphar/apparmor-readonly-root-fix
apparmor: make pkg/aaparser work on read-only root
Upstream-commit: 6b262572028cc249b7da8cc55459197395fdb33e
Component: engine
2017-05-18 23:17:31 +02:00
Kenfe-Mickaël Laventure b7e3ae2808 Merge pull request #33264 from wenjianhn/chkp-ls
Fix checkpoint ls
Upstream-commit: cc24049f77eb94ad486bd22c2470f0d13d6158a1
Component: engine
2017-05-18 13:37:42 -07:00
Sebastiaan van Stijn fa959621f1 Merge pull request #33271 from masahide/fix-append-loop-awslogs
Improved poor memory efficiency of awslogs
Upstream-commit: 7061b0f748c29ffd1e6852cdc5dd11f90840eb1c
Component: engine
2017-05-18 21:29:17 +02:00
Aaron Lehmann d490134960 Update CLI commit hash
Since this new version of the CLI resolves image digests for swarm
services by default, and we do not want integration tests to talk to
Docker Hub, update CLI tests to suppress this behavior.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d012569b78c27e6e52bc5006d9a1d7a2099b1c2b
Component: engine
2017-05-18 12:23:28 -07:00
Daniel Nephin 4d54b44919 Enabled linux/ppc64le cross build.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 46049dd0b6
Component: cli
2017-05-18 13:07:26 -04:00
YAMASAKI Masahide 17712f857a Improved poor memory efficiency of awslogs
Signed-off-by: YAMASAKI Masahide <masahide.y@gmail.com>
Upstream-commit: 524f30634018ce619da61aa0a13dad245e098226
Component: engine
2017-05-18 23:30:00 +09:00
Christopher Jones f074fcfdd0 [pkg/term] switch more syscalls to /x/sys/
Switches the remaining syscalls except Errno to /x/sys/.
This was supposed to be part of 33180

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: df6dfcf198a769e7f411736e1abb93e1aabb2698
Component: engine
2017-05-18 09:02:42 -04:00
Vincent Demeester 4b438a3414 Merge pull request #33116 from dnephin/refactor-builder-copy
[Builder] Refactor COPY/ADD dispatchers
Upstream-commit: 23e857cd3de399b8894442d49efdc83570995fe4
Component: engine
2017-05-18 14:18:14 +02:00
yupengzte a8771c2674 ineffectual assignment to isCanonical, delete it
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: b28c1eae01e73fb92fe46f60a1bbd4e4f5a223b1
Component: engine
2017-05-18 17:16:19 +08:00
Sebastiaan van Stijn bc98a48832 Merge pull request #77 from vdemeester/move-duration-opts
Move duration opts into an opts package
Upstream-commit: eea4a38cd6
Component: cli
2017-05-18 11:15:30 +02:00
Madhu Venugopal 4d51624a17 Merge pull request #62 from abhinandanpb/master
Adding network specific option in csv format for service create/update
Upstream-commit: 3dfb8343b1
Component: cli
2017-05-17 21:17:23 -07:00
Abhinandan Prativadi 6065480cb3 moving opts to cli repo
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 0893ab8560
Component: cli
2017-05-17 21:08:58 -07:00
Abhinandan Prativadi e4194f2c92 moby vendoring
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 2e07636e5e
Component: cli
2017-05-17 21:08:57 -07:00
Abhinandan Prativadi dd32a4ed8f Adding network options to service create/update
Changes added to accept network specific options in
docker service create/update

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: 40341ae089
Component: cli
2017-05-17 21:07:48 -07:00
Madhu Venugopal 94f743d6a5 Merge pull request #33130 from abhinandanpb/network-opt
Adding network specific options to service create/update
Upstream-commit: 45c6f4262a865a03adaac291a9ce33c0f2190d77
Component: engine
2017-05-17 21:03:06 -07:00
Madhu Venugopal 6046962f0a Merge pull request #49 from aboch/nlo2
Add network create flags --scope, --config-only, --config-from
Upstream-commit: d156151ba1
Component: cli
2017-05-17 20:08:23 -07:00
Jacob Wen a65ff11d52 Fix checkpoint ls
Use create=false when calling getCheckpointDir
Fix #33263

Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
Upstream-commit: c0d2ec1eb585a31e3d7734aef7acb753644c49c0
Component: engine
2017-05-18 10:57:10 +08:00
Alessandro Boch e90e12563c Vendor moby/moby @4874e0
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f7415aa953
Component: cli
2017-05-17 19:55:09 -07:00
Madhu Venugopal fa9d85bebb Merge pull request #33239 from nishanttotla/add-platform-information-service-spec
Adding compatible platforms to service spec
Upstream-commit: 4874e05f7452d7d9c60db50296d04c802ce76ae1
Component: engine
2017-05-17 19:31:24 -07:00
Abhinandan Prativadi 4f144ce76f swarmkit vendoring
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: f3d8ff774e77c44f5b13474f74602ff772eb2f40
Component: engine
2017-05-17 18:46:34 -07:00
Abhinandan Prativadi cee45f7710 Adding network specific options to service create/update
The commit adds capability to accept csv parameters
for network option in service create/update commands.The change
includes name,alias driver options specific to the network.
With this the following will be supported

docker service create --name web --network name=docknet,alias=web1,driver-opt=field1=value1 nginx
docker service create --name web --network docknet nginx
docker service update web --network-add name=docknet,alias=web1,driver-opt=field1=value1
docker service update web --network-rm docknet

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: fe11de01772ec7c7501d3b679ce94d41bcc14060
Component: engine
2017-05-17 18:46:34 -07:00
Madhu Venugopal e5cff91fe3 Merge pull request #32981 from aboch/nlo2
Support swarm-mode services with node-local networks
Upstream-commit: ca4b3c6f677cb67722cba32c279a90090a645094
Component: engine
2017-05-17 18:43:06 -07:00
Aaron Lehmann f4e4bf60ab api: Only return a Platform when relevant information is available
I noticed that we could return a Platform that has no information filled
in. This doesn't look like it would cause any problems, but it would be
confusing. Fix the handler to only append to this slice when the
Platform is not empty.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: df86a14af21539422f667ae33601a4f24f21e574
Component: engine
2017-05-17 18:42:16 -07:00
Sebastiaan van Stijn 9b300a1def Merge pull request #30 from nishanttotla/rename-trust-function
Moving docker service digest pinning to client side
Upstream-commit: 74cc280521
Component: cli
2017-05-18 03:05:48 +02:00
Nishant Totla d8354ad717 Adding a flag to allow disabling registry lookup
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 39d03bb2bd
Component: cli
2017-05-17 17:55:11 -07:00
Nishant Totla fd1d1e23c8 Service create/update set QueryRegistry appropriately
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: c61ea6f789
Component: cli
2017-05-17 17:39:35 -07:00
Alessandro Boch 17199df157 Add support for config-only, config-from and scope options
- To promote a network to swarm mode

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b5e43fb5ec
Component: cli
2017-05-17 17:17:50 -07:00
Nishant Totla 5e539a93fd Updating test for compatible platforms to test unmarshal body
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 7d4b8fb3b56168326f36157064741539f34490b7
Component: engine
2017-05-17 17:12:22 -07:00
Tõnis Tiigi 55f1c34adc Merge pull request #32986 from moypray/containerd_close
fix when rpc reports "transport is closing" error, health check go routine will exit
Upstream-commit: e103125883ec3c03a8523682ed62f33d04e0ade9
Component: engine
2017-05-17 17:04:05 -07:00
Sebastiaan van Stijn 6ff9bdf996 Merge pull request #80 from AkihiroSuda/adjust-docker-stats
[Carry moby/moby#32777] Adjusted docker stats memory output
Upstream-commit: 85c2330dfa
Component: cli
2017-05-18 01:55:52 +02:00
Sebastiaan van Stijn 621e243582 Merge pull request #101 from jlhawn/update_container_wait
Update `run` and `start` to use container wait API
Upstream-commit: b3e7e1ff74
Component: cli
2017-05-18 01:31:40 +02:00
Tibor Vass 705b40c511 Merge pull request #21 from aduermael/prune-security
prune commands : make sure label filters are considered
Upstream-commit: 63ecaf1d4f
Component: cli
2017-05-17 16:23:27 -07:00
Nishant Totla 3ff6579fec Adding compatible platforms to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 587d07cca89be978b9f9ca3203ad28b7179e49fd
Component: engine
2017-05-17 16:20:42 -07:00
Alessandro Boch ee2b1d2417 Docs and manual changes
- for service create on node-local networks

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: d618b56b40aad7e3695583015fe0f6731d12f413
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch a5f77dbdd1 Vendor gogoprotobuf v0.4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 3950cef94111ccd7d15091059e562960554900fc
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch a66a7ebd10 Vendor swarmkit @998a47f
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8daeeacfc1126eafb2b6d00e2dc6e2f5a6ed78cc
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch 73e3c52c67 Vendoring libnetwork @b2bc1a6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 46392f2442137ad52bb7382e91e7ad4b70d323b9
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch 4f94cc50a4 Integrate local datascope network with swarm
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b34d3e730fe3eee4b058e4dc165a7d4964e00a2a
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch eefcf59562 Allow to control network scope
- User can now promote a network's scope to swarm,
  so that the network is visible to swarm

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: fcafc7108b7b7f2ca9c2982b29b47de424f2da52
Component: engine
2017-05-17 15:50:28 -07:00
Alessandro Boch 9f01da606a Support configuration networks
- They are configuration-only networks which
  can be used to supply the configuration
  when creating regular networks.
- They do not get allocated and do net get plumbed.
  Drivers do not get to know about them.
- They can be removed, once no other network is
  using them.
- When user creates a network specifying a
  configuration network for the config, no
  other network specific configuration field
  is are accepted. User can only specify
  network operator fields (attachable, internal,...)

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 9ee7b4dda926a1444dc0ea50c4ca6d90c8684060
Component: engine
2017-05-17 15:50:28 -07:00
Josh Hawn 6ab9e202e7 Refactor holdHijackedConnection
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 6eca53c7ae
Component: cli
2017-05-17 15:18:01 -07:00
Aaron Lehmann 7bd85ca42f Merge pull request #32421 from dongluochen/swarmkit_events
support cluster events
Upstream-commit: 3d630498c3d7c8d23889df3cf006128a1d5ddad4
Component: engine
2017-05-17 14:25:32 -07:00
Kenfe-Mickaël Laventure 484d9f1587 Merge pull request #92 from vdemeester/add-codecov
Add codecov configuration
Upstream-commit: 8372ae744e
Component: cli
2017-05-17 13:50:03 -07:00