Commit Graph

24865 Commits

Author SHA1 Message Date
51e7a5bb32 Merge pull request #25669 from dlech/patch-2
Move export from image commands to container commands
Upstream-commit: 838db8852cb58e4990c655f09d5b7c50cc5396a6
Component: engine
2016-08-12 15:52:07 -04:00
05ad7877f1 Merge pull request #24814 from samuelkarp/awslogs
awslogs: Record log line insert order for sorting
Upstream-commit: c6e3818dd11a19b8385e62ed244c0c4e4e75fc89
Component: engine
2016-08-12 15:51:06 -04:00
0cdcb92bda Merge pull request #22208 from msabansal/staticip
Enabling specifying static ip for predefined network on windows
Upstream-commit: 5632768a0f5237ca63275a193266389b7cabcb3b
Component: engine
2016-08-12 11:39:25 -07:00
cde4831d1f Merge pull request #24717 from icaoweiwei/patch_2016-07-16_1
Add output of integer argument
Upstream-commit: 2c50035f93ec580fb1b901a2c99a2f95f525a796
Component: engine
2016-08-12 10:54:01 -07:00
3d962f1295 Merge pull request #25657 from thaJeztah/update-image-load-api-docs
Update API docs example for image load response
Upstream-commit: 5dbdc321dc52dff8424cd569438308b53ebca103
Component: engine
2016-08-12 10:29:01 -07:00
c6f3cd200c Merge pull request #25070 from yongtang/24881-label-containers-with-stack-name
Label containers with stack name when deploying stack/bundle
Upstream-commit: a86b2376a075b5459b202615667faa6b2980788d
Component: engine
2016-08-12 10:20:06 -07:00
b6f32f3c93 Move export from image commands to container commands
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
Upstream-commit: 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd
Component: engine
2016-08-12 12:15:32 -05:00
894d8b6245 Merge pull request #25668 from LK4D4/remove_rewrite
hack/vendor.sh: remove old hacks for etcd
Upstream-commit: f4646196b6694cd4662a366906377c2fd5c73fde
Component: engine
2016-08-12 10:12:50 -07:00
e8a6674a00 Merge pull request #25635 from dperny/rate-limit-swarm-pull-log
Rate limit logspam during docker service pulls
Upstream-commit: b0431d63dca1573d66624dd67230bf0d9c8ef623
Component: engine
2016-08-12 13:06:39 -04:00
b6188d5df3 Merge pull request #25660 from justincormack/no-fuse-dev
Do not create /dev/fuse by default
Upstream-commit: b08a1c3fe48472d7b688429e10695eb9132d2577
Component: engine
2016-08-12 10:05:16 -07:00
c49627f859 Merge pull request #25628 from cpuguy83/carry_21567_filter_vol_by_label
Carry 21567 filter vol by label
Upstream-commit: be045ee2da7c2c83e859d86cb496e86ec6de8566
Component: engine
2016-08-12 09:43:45 -07:00
1dbc55e6ff Merge pull request #25509 from Microsoft/jjh/23079
Windows: Block ReFS file systems
Upstream-commit: 34cc19f6702c23b2ae4aad2b169ca64154404f9f
Component: engine
2016-08-12 09:32:22 -07:00
6b6387c135 hack/vendor.sh: remove old hacks for etcd
etcd uses standard vendoring now

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6623a5342c7b982ebc630974490eac06792d0605
Component: engine
2016-08-12 08:50:52 -07:00
8e29f88e6f Merge pull request #25568 from thaJeztah/enhance-string-truncate
Implement stringutils.Ellipsis()
Upstream-commit: 64f83cee43c6fc0785e2beeacc6432572130714b
Component: engine
2016-08-12 17:19:50 +02:00
e6beba2d43 Do not create /dev/fuse by default
This device is not required by the OCI spec.

The rationale for this was linked to docker/docker#2393

So a non functional /dev/fuse was created, and actual fuse use still is
required to add the device explicitly. However even old versions of the JVM
on Ubuntu 12.04 no longer require the fuse package, and this is all not
needed.

See also https://github.com/opencontainers/runc/pull/983 although this
change alone stops the fuse device being created.

Tested and does not change actual ability to use fuse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 39ecc08f327451e4fc30f15a6fb3bd4c979acc73
Component: engine
2016-08-12 12:33:42 +01:00
f039ea6e5b Update API docs example for image load response
Commit 353af0b3ecfe483568fd88754e432c92b0ec088b updated
the `/image/load` endpoint to consistendly return
JSON, but did not update the associated documentation.

This updates the example response in the documentation
to match the actual response.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 419d2ad0f8adc687bb25831d62f462353557a706
Component: engine
2016-08-12 11:57:34 +02:00
720eb363bf Merge pull request #25564 from coolljt0725/fix_inspect_network
Fix inspect network show gateway with mask
Upstream-commit: d8240c8e27b625c6c2b7982e2473cce46e2a9ddc
Component: engine
2016-08-12 11:11:09 +02:00
d24087f666 Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd
Vendor new swarmkit and etcd/raft
Upstream-commit: 4f20721c9aefeec819a42e9a8e6f7a21e76c1534
Component: engine
2016-08-12 11:10:58 +02:00
3ced96b1ad Merge pull request #25557 from yongtang/25529-image-load-api
Return `application/json` for image/load API (quiet=1)
Upstream-commit: 353af0b3ecfe483568fd88754e432c92b0ec088b
Component: engine
2016-08-12 11:07:43 +02:00
1b23be6e0a Merge pull request #25642 from anusha-ragunathan/plugin-shutdown-lock
Fix deadlock on plugin shutdown.
Upstream-commit: 57cf20c2ca4359b58baa0b008fda1e18890bb56d
Component: engine
2016-08-11 21:07:34 -07:00
760a099e44 Merge pull request #25646 from tiborvass/fix-network-flag-on-service-update
Remove --network-add and --network-rm flags from service update
Upstream-commit: a9a6d4e2145ab98355b6a8749f2e37f400cbe464
Component: engine
2016-08-11 21:06:28 -07:00
42880e91b6 Remove --network-add and --network-rm flags from service update
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3a7e90c743f6fdccb8aecb9d6d9afd42232fa736
Component: engine
2016-08-11 19:37:21 -07:00
cdfc3ebd94 Fix deadlock on plugin shutdown.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 4d009084de8cad94a180130eb57efa2a98df6d98
Component: engine
2016-08-11 19:36:32 -07:00
46db5e3595 Vendoring libnetwork for 1.12.1-rc1
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: b9c9fa2855cd5c7391cd026ef13a7d9d061214ee
Component: engine
2016-08-11 18:44:32 -07:00
cb6631c865 Vendor new swarmkit and etcd/raft.
This brings in a much newer version of etcd/raft.

An unrelated change in swarmkit should fix some problems with
integration tests on ARM.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: be48cfc8eb2f517563991b007c261fed58301fd1
Component: engine
2016-08-11 18:35:21 -07:00
8eacfa50f9 Fix inspect network show gateway with mask
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 096bb5fb0740656b91b3e35f8df23c79270f7f90
Component: engine
2016-08-11 21:08:54 -04:00
f0aac47123 Merge pull request #25630 from dims/mask-timer_list
Adding /proc/timer_list to the masked paths list
Upstream-commit: 5947bf461fff871e0008a6366da1e979404f18f5
Component: engine
2016-08-11 23:37:12 +01:00
95f97c43df Rate limit logspam during docker service pulls
During image pulls on docker service create, logs will only show status
updates and updates every 1 second on long-running actions like
downloading and extracting. Adds golang.org/x/time/rate as dependency.

Ports docker/swarmkit#1352 to docker/docker.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: fa0054a3eb0363526d34fb4ac912cab30044f3d7
Component: engine
2016-08-11 14:56:38 -07:00
c57bbdb1c7 Merge pull request #25505 from darrenstahlmsft/SignalProcessNewAPI
Changed SignalProcess to use new hcsshim API
Upstream-commit: 92ef3f615a95c0359f7abfc5f686d5e0392dd48b
Component: engine
2016-08-11 23:21:31 +02:00
2e55ebe213 Merge pull request #25561 from allencloud/make-more-pkgs-support-darwin
make more pkgs support darwin
Upstream-commit: 3011a41d3f3b525574407493696ea2391ecc0ff6
Component: engine
2016-08-11 14:17:57 -07:00
eda65f43e9 Merge pull request #25614 from mbentley/docs-update-ubuntu-install
Add install of virtual kernel extras for AUFS
Upstream-commit: 532aeff9d553f46d46ec7c164a4dd26af18b9fd6
Component: engine
2016-08-11 13:47:33 -07:00
80712ffaad Merge pull request #25548 from thaJeztah/plugin-api-docs
Add API documentation for experimental plugin features
Upstream-commit: 5b68177a6e3865a3880d8b3a4e5b932d3ccae1dc
Component: engine
2016-08-11 21:52:04 +02:00
95ecd4a19b Merge pull request #25570 from allencloud/remove-fl-prefix-in-ContainerOptions
remove fl prefix in containerOptions
Upstream-commit: d6bf76136fc475ed67b56cb32eab4570f09f9b32
Component: engine
2016-08-11 15:43:41 -04:00
a351dde060 Merge pull request #25524 from WeiZhang555/debug-win2lin
Bugfix: client hangs after run container
Upstream-commit: 52286b402ef4c25ac90b35f23a9717680e0f8ff7
Component: engine
2016-08-11 15:43:00 -04:00
95824f44c0 Adding /proc/timer_list to the masked paths list
/proc/timer_list seems to leak information about the host. Here is
an example from a busybox container running on docker+kubernetes.

 # cat /proc/timer_list | grep -i -e kube
 <ffff8800b8cc3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2497
 <ffff880129ac3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3478
 <ffff8800b1b77db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3470
 <ffff8800bb6abdb0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2499

Signed-Off-By: Davanum Srinivas <davanum@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
Upstream-commit: 03bd00b68f28062ef6b09a43a4c381af63b91673
Component: engine
2016-08-11 15:19:26 -04:00
682232d48f Merge pull request #25593 from thtanaka/oracle-selinux
Add Oracle Linux distro specific selinux policy
Upstream-commit: faaab62f73f75af61e14cba5446fc7cd67934f01
Component: engine
2016-08-11 11:27:54 -07:00
915e5e6f9f Merge pull request #25591 from tiborvass/fix-release-script
Make release scripts architecture-agnostic and add ARM support
Upstream-commit: 7758ced59427a41d2205bc26cbd4596c71a47072
Component: engine
2016-08-11 11:27:19 -07:00
6221e2aa8d Make release scripts architecture-agnostic and add ARM support
This patch allows to only release the packages that were built and are
present under the bundles/ directory instead of assuming packages exist
for all distros enumerated in the contrib/builder/ directory.

It also now adds support for armhf architecture for apt repositories.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 2ff2e9a73076b737948c68c26f26b7bda5ac7db8
Component: engine
2016-08-11 11:18:52 -07:00
fb8424f405 Merge pull request #25428 from yongtang/25375-idempotent-service-update-publish-add
Fix issue in `service update --publish-add`
Upstream-commit: 49cd1680f03f1a388549594373a0717c7fab8b44
Component: engine
2016-08-11 20:11:33 +02:00
6b32efbe7a Carry #21567
Use `LabeledVolume` interface type instead of manual interface.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6d787dae1ae3cd4f2ca062b67592158597f9d40e
Component: engine
2016-08-11 13:47:01 -04:00
29b14d83fb Add label filter support for volume
Since we added labels for volume, it is desired to have
filter support label for volume

Closes: #21416
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 1a72934cd5cb369f75e7bd5714eb579a053b95a9
Component: engine
2016-08-11 13:08:04 -04:00
746c53746d Merge pull request #25595 from thaJeztah/add-warning-to-changelog
Add warning about systemd socket activation to changelog
Upstream-commit: d834eb69102230716a4ff729617e6fe680ddcbb6
Component: engine
2016-08-11 12:57:14 -04:00
b381837a1c Refactor waitExitOrRemoved by mlaventure
Reduce complexity of waitExitOrRemoved.

Signed-off-by: mlaventure
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: eadcb996192e0bded2eaadef842dd86e9013cc27
Component: engine
2016-08-12 00:50:07 +08:00
63a92c313a Merge pull request #25603 from mavenugo/1.12-rc1-ln-vin
Vendoring libnetwork for 1.12.1-rc1
Upstream-commit: e4a88b3a23230bdcafe5cb0f410a7d030a66bf17
Component: engine
2016-08-11 15:39:28 +02:00
60e441e430 Implement stringutils.Ellipsis()
This patch implements an Ellipsis utility to
append an ellipsis (...)  when truncating
strings in output.

It also fixes the existing Truncate() utility
to be compatible with unicode/multibyte characters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 51dc35cf23a5418e93128854bedc2e59d8ca743a
Component: engine
2016-08-11 14:14:06 +02:00
adf210319c Merge pull request #25556 from vieux/plugin_description
add description in docker plugin ls
Upstream-commit: ed1a313d8f03ce1cc2eef56e66644fccb4d61eaa
Component: engine
2016-08-11 14:08:50 +02:00
3344338b88 Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api
add fields in volume api for 1.24, 1.25
Upstream-commit: a3432c2fdbc2bdab15e49599815f42660904fdd9
Component: engine
2016-08-11 14:03:25 +02:00
0eb3f4278c add fields in volume api for 1.24, 1.25
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b015fd4fb3a8def4812491bae702275efc6ab0cb
Component: engine
2016-08-11 19:56:17 +08:00
7c0ad19006 Add install of virtual kernel extras for AUFS
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: e715ca506f41b22cde21187328fcb416cec5e6a2
Component: engine
2016-08-11 07:54:20 -04:00
78c72ac827 Merge pull request #25611 from lixiaobing10051267/masterJoin
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
2016-08-11 13:30:07 +02:00