58deeedf40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00
4f88ba8722
inital seccomp support
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6707f4b9b638b367a1dde6f8684a5b9817a882f0
Component: engine
2015-12-03 16:30:44 -08:00
174151a454
update debs/rpms for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 255004ef335d5e6cc4ec0f51ecff676e9d84643b
Component: engine
2015-12-03 16:20:05 -08:00
bb9f4fa0e8
dockerfile update for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d616a097638bc73a652bcf5f7b25465c25bfaa83
Component: engine
2015-12-03 16:20:03 -08:00
287778e637
Merge pull request #18402 from Microsoft/jjh/timeout
...
Windows CI Fix: Timeout change
Upstream-commit: 2856a3048238d7a746d57028e48ea2489555e6e5
Component: engine
2015-12-03 14:33:09 -08:00
5fc75a60ac
Merge pull request #18347 from tiborvass/container_package
...
Move Container to its own package (carry of 17969)
Upstream-commit: 168b490062aed36bf95426d9d66dcf5703842016
Component: engine
2015-12-03 14:10:16 -08:00
0b8eb4aacf
Merge pull request #18374 from calavera/volume_inspect_exit
...
Return error code when `volume inspect` fails with a template.
Upstream-commit: 29c69ce2a9158899257aa3e015b4db098f662bdd
Component: engine
2015-12-03 13:31:47 -08:00
9f99937185
Merge pull request #17481 from vdemeester/17446-network-inspect-format
...
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
ec460c332e
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2097e7fceec5c58352f78e8667000c8b5cb85231
Component: engine
2015-12-03 12:45:56 -08:00
55ae612250
Merge pull request #18397 from Microsoft/jjh/fix-windows-ci
...
Fix broken Windows CI
Upstream-commit: 94d5459a0ca3b40d0ae34747a862d06bf20fd221
Component: engine
2015-12-03 12:41:19 -08:00
44348463e0
Move DisconnectFromNetwork back to daemon/
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5bb4d0d9ea6a6c85a3f9a4a147fd7db0101eb725
Component: engine
2015-12-03 20:10:27 +01:00
fb9a8a9552
Merge pull request #18394 from thaJeztah/carry-17869-add-volume-driver
...
[Carry 17869] Add docs and man page entry for --volume-driver
Upstream-commit: 2f9b541b8991a371dfa800fbef0ccaea61601f59
Component: engine
2015-12-03 20:06:18 +01:00
33e1a90c6b
Return error code when volume inspect fails with a template.
...
Following `docker inspect` conventions:
- Keep partial info in a buffer to not print incomplete template outputs.
- Break execution when template parsing or decoding fail.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b9d30280f6eb2f817b1315c22953a133f1b66e69
Component: engine
2015-12-03 13:22:55 -05:00
33cb231c55
Fix broken Windows CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c10311bc9a981f1fdea88ba5f488225eaeea2b69
Component: engine
2015-12-03 10:12:11 -08:00
a103145fec
Merge pull request #18391 from runcom/remove-daemon-config-func
...
daemon: remove private func config()
Upstream-commit: d9755df2b3b224a7c9895279fde17e9d4f826c10
Component: engine
2015-12-03 11:42:31 -05:00
d010c48ce4
Move Container to its own package.
...
So other packages don't need to import the daemon package when they
want to use this struct.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6bb0d1816acd8d4f7a542a6aac047da2b874f476
Component: engine
2015-12-03 17:39:49 +01:00
0082efd193
Merge pull request #18266 from calavera/events_pub_sub
...
Event PubSub topics + linear filtering.
Upstream-commit: 33ab2bb52c130380e038013d68fdd8ad3c663360
Component: engine
2015-12-03 17:11:40 +01:00
476079ebd7
Address review comments.
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a2120e5ba3337f70a63fd64ea773e50ce5af31ca
Component: engine
2015-12-03 16:07:54 +01:00
c7c45c24a8
Add docs and man page entry for --volume-driver
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: fe3ec3f77fd71d8544bc640b3d91f563f7d68013
Component: engine
2015-12-03 16:02:20 +01:00
0eb3ab8587
daemon: remove private func config()
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 3662f58083fbef56caf0eb4b2bab7d2a2a2672d5
Component: engine
2015-12-03 11:46:53 +01:00
50eaa45a45
Merge pull request #18375 from vbatts/tar-split_update
...
vendor: update tar-split to v0.9.11
Upstream-commit: 1475f567cbf002aad3db6ed829d9285a70febdb0
Component: engine
2015-12-02 20:25:07 -08:00
b67c72dbf8
Merge pull request #18231 from mqliang/resp
...
rename req to resp
Upstream-commit: 580534ba2e71782d65237170d4ad6356760042c7
Component: engine
2015-12-02 14:58:29 -08:00
d555e15f77
Add PubSub topics.
...
A TopicFunc is an interface to let the pubisher decide whether it needs
to send a message to a subscriber or not. It returns true if the
publisher must send the message and false otherwise.
Users of the pubsub package can create a subscriber with a topic
function by calling `pubsub.SubscribeTopic`.
Message delivery has also been modified to use concurrent channels per
subscriber. That way, topic verification and message delivery is not
o(N+M) anymore, based on the number of subscribers and topic verification
complexity.
Using pubsub topics, the API stops controlling the message delivery,
delegating that function to a topic generated with the filtering
provided by the user. The publisher sends every message to the
subscriber if there is no filter, but the api doesn't have to select
messages to return anymore.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 434d2e8745696255a204d9eefc6a2854ff74e5c2
Component: engine
2015-12-02 16:43:49 -05:00
72c9d02b1c
Merge pull request #18301 from wenchma/doc_update_for_net
...
Add NETWORK_NAME_or_ID value for --net= option
Upstream-commit: ee3e07d3593f97466df6fc11c19f91c1aee76dd4
Component: engine
2015-12-02 22:36:01 +01:00
f437e2a3c8
Add format flag to network inspect
...
…for consistency as docker inspect and docker volume inspect supports it too
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b
Component: engine
2015-12-02 22:32:10 +01:00
15181abee7
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
d55350cb73
Merge pull request #18376 from jfrazelle/fix-default-shm-size
...
fix default shm size in test
Upstream-commit: 61773e5cbf62badf41c6c9d110fca2e7b036a6ac
Component: engine
2015-12-02 12:54:07 -08:00
5811737ebb
Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
...
Carry 17293 add examples in search
Upstream-commit: d410cd47518b323064994f80022927a45b4e22c2
Component: engine
2015-12-02 21:52:52 +01:00
d7c300489b
fix default shm size in test
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 4354b348ad6f9a585c57d37147c2a893a2d873da
Component: engine
2015-12-02 12:43:51 -08:00
d4bbe1cfa0
vendor: update tar-split to v0.9.11
...
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 919104e6bb19b2e815236ee5cffa919c373f85e2
Component: engine
2015-12-02 15:34:12 -05:00
01641ba275
Merge pull request #18371 from sallyom/dontReturnNonError
...
don't return error if can't delete non-existing container
Upstream-commit: aa2ca5d93c2b30ba13ff67820a49d6f570323576
Component: engine
2015-12-02 11:59:50 -08:00
b43875ed4c
Merge pull request #18369 from LK4D4/misleading_rm
...
daemon/delete.go: use less confusing naming of functions
Upstream-commit: f8364c013db9fe8483f2c44a513eaea473f54ebe
Component: engine
2015-12-02 11:57:18 -08:00
a7b1157339
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
4ceb4f0c9f
Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation
...
[carry] configuring DNS options on systemd
Upstream-commit: f4176f91690a16b08c320984e17c049098d3f1f7
Component: engine
2015-12-02 11:39:18 -08:00
96c08be56e
Merge pull request #18285 from hqhq/hq_fix_swappiness
...
Set default MemorySwappiness when adapt
Upstream-commit: f411b101acdeefa731dc9e03dc75fbbd6ba816c6
Component: engine
2015-12-02 14:25:08 -05:00
9a973af9b7
Merge pull request #13587 from rhatdan/volume-tmpfs
...
Add tmpfs as a valid volume source command.
Upstream-commit: d4be46def4660f2dea090646f8d768f38c6fd520
Component: engine
2015-12-02 11:16:49 -08:00
8ce05800f4
daemon/delete.go: use less confusing naming of functions
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 828f63f1abbad4246bd5198f02c9c34ce0d44b2b
Component: engine
2015-12-02 11:10:14 -08:00
df1c14dfd2
don't return error if can't delete non-existing container
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: bfa5027e96a6a5532c7cc89bd00be219082833fa
Component: engine
2015-12-02 13:48:59 -05:00
e9b5c8b47b
Merge pull request #18240 from pospispa/Improvement-of-docker-top-Man-Page
...
Improvement of docker top Man Page
Upstream-commit: 10b30cf09c42904d8072a64c1d0ebd96a91ad8f3
Component: engine
2015-12-02 10:29:00 -08:00
9c256bfc19
Merge pull request #18368 from brahmaroutu/gccgo_fix
...
fix the Dockerfile.gccgo for new dependency
Upstream-commit: e274db94dd16e3a8439972cbe36d0dbaccf7e57a
Component: engine
2015-12-02 10:03:29 -08:00
72a4a2701c
Merge pull request #17769 from tianon/vendor-windows
...
Fix Windows support in .vendor-helpers.sh
Upstream-commit: 289251d088959076d0e8a0335a4b028d3453d486
Component: engine
2015-12-02 10:02:08 -08:00
9fd5cc2301
Improvement of docker top Man Page
...
Some users expect that the `docker top $CONT` command displays information from the inside container perspective.
They expect that the `docker top $CONT` command displays same information as the `docker exec $CONT ps -ef` command. But it does not.
That's why the `docker top` man page shall explicitly state that the `docker top $CONT` displays information from the host's point of view.
Signed-off-by: Pavel Pospisil <pospispa@gmail.com >
Upstream-commit: 1edc410e412b9c06869e508f5781cd2cdc0a14af
Component: engine
2015-12-02 18:54:52 +01:00
eeb2edd35a
fix the Dockerfile.gccgo for new dependency
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 50814a2bc0376bf144f5d235dd3662971adac14d
Component: engine
2015-12-02 16:44:07 +00:00
30eb543363
fix minor markup issues
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0f2986cee57e1854f3346ca7609740bdd51d0dcb
Component: engine
2015-12-02 17:21:06 +01:00
529645209e
Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater
...
modified note to provide a link for installation instructions on Ubuntu 15.04 or above
cleaned up typos for ubuntulinux.md
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52
Component: engine
2015-12-02 17:21:05 +01:00
cf1f5d3461
Merge pull request #18350 from duglin/Issue9798a
...
Deprecate -f flag from docker tag
Upstream-commit: fcccf2dae4770bdb7781d57e20ae94b9565b67ac
Component: engine
2015-12-02 08:16:09 -08:00
d6f6dfdf0d
Merge pull request #18365 from estesp/clarify-error-messages
...
Differentiate integration test error messages
Upstream-commit: d9163e088e41491cfe6d49fef17b1dff149a1b0e
Component: engine
2015-12-02 08:14:53 -08:00
cd57abf420
Merge pull request #18351 from LK4D4/fix_rm_race
...
Fix race between two ContainerRm
Upstream-commit: e07769bc5a50355d972cbc71d150dc2d339f7370
Component: engine
2015-12-02 08:13:52 -08:00
79750c94df
Make filtering a linear operation.
...
Improves the current filtering implementation complixity.
Currently, the best case is O(N) and worst case O(N^2) for key-value filtering.
In the new implementation, the best case is O(1) and worst case O(N), again for key-value filtering.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 93d1dd8036d57f5cf1e5cbbbad875ae9a6fa6180
Component: engine
2015-12-02 11:12:42 -05:00
26a5e0a515
update order and address review notes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 920a2618392d5235b9823b97aeb80ad858639b81
Component: engine
2015-12-02 16:38:51 +01:00
