51b0f23127
Merge pull request #18398 from calavera/system_backend
...
Move docker system information to a dedicated router and backend.
2015-12-04 12:56:57 -05:00
e29f208547
Merge pull request #18404 from jfrazelle/cleanup-maintainers
...
cleanup people in maintainers file
2015-12-04 09:25:43 -08:00
5a9bf3a3d3
Merge pull request #18434 from haugene/master
...
docs: fix typo in bash_history mount example
2015-12-04 16:15:36 +01:00
655766ed95
docs: fix typo in bash_history mount example
...
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
2015-12-04 16:09:25 +01:00
e3fbd6922f
Merge pull request #18325 from RsrchBoy/topic/newtorks
...
newtork -> network (minor spelling correction)
2015-12-04 14:03:55 +01:00
cb6a1a6042
Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
...
Add support for blkio read/write bps device
2015-12-04 12:29:58 +01:00
605c56295f
Merge pull request #18384 from Mashimiao/weight-device-docs-fix
...
docs: fix blkio-weight-device option args
2015-12-04 12:04:23 +01:00
7c1c96551d
Merge pull request #18412 from aaronlehmann/runcommand-race
...
Fix race in RunCommandWithOutputForDuration
2015-12-03 19:35:04 -08:00
a65502f751
Merge pull request #18413 from jfrazelle/update-go-version
...
update go version
2015-12-03 18:18:47 -08:00
c80d03db77
Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
...
Vendor distribution and fix inspect by sha256 prefix
2015-12-03 20:59:47 -05:00
cc0e407e17
docs: fix weight-deivce option args
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:28:35 +08:00
3f15a055e5
Add support for blkio read/write bps device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:26:03 +08:00
b7b707af2e
update go version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:37:13 -08:00
4e6bea5964
Merge pull request #18411 from aaronlehmann/unit-test-timing
...
Adjust TestDockerCmdWithTimeout timeout to improve reliability
2015-12-03 16:34:36 -08:00
2704fd9156
Fix race in RunCommandWithOutputForDuration
...
This function was starting a goroutine that modifies one of its return
values. The intent is for the goroutine to only influence the return
value when it's causing the function to return, but it's racy and can
also modify the return value when the function is returning due to the
timeout. Fix the goroutine to not modify return values directly.
Also, give the channel a buffer so that the goroutine doesn't block
forever after a timeout.
Fixes #18305
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-03 16:34:01 -08:00
13d768b8ee
Adjust TestDockerCmdWithTimeout timeout to improve reliability
...
I saw a failure of TestDockerCmdWithTimeout. This test starts a command
that produces output after 10 ms, but uses a 5 ms timeout, so normally
the command will be killed before the output. The time intervals are so
small that the timeout may not reliably trigger before the output, which
can cause the test to fail.
This commit changes the test to only fail if the process is still alive
after 10 seconds. This means the test will confirm that the timeouts are
happening, but not attempt to gauge that the timeouts are happening
within milliseconds of when they are expected (which can't be done
reliably).
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-03 14:42:32 -08:00
2856a30482
Merge pull request #18402 from Microsoft/jjh/timeout
...
Windows CI Fix: Timeout change
2015-12-03 14:33:09 -08:00
168b490062
Merge pull request #18347 from tiborvass/container_package
...
Move Container to its own package (carry of 17969)
2015-12-03 14:10:16 -08:00
61d6240069
Add test for inspect with a sha256 prefix
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 14:06:30 -08:00
53cd579b6e
vendor: bump distribution to 568bf038af
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 13:36:31 -08:00
29c69ce2a9
Merge pull request #18374 from calavera/volume_inspect_exit
...
Return error code when `volume inspect` fails with a template.
2015-12-03 13:31:47 -08:00
4d849619d4
Merge pull request #17481 from vdemeester/17446-network-inspect-format
...
Add format flag to network inspect
2015-12-03 16:16:04 -05:00
2097e7fcee
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 12:45:56 -08:00
94d5459a0c
Merge pull request #18397 from Microsoft/jjh/fix-windows-ci
...
Fix broken Windows CI
2015-12-03 12:41:19 -08:00
b97110dda7
cleanup people in maintainers file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 12:14:37 -08:00
5bb4d0d9ea
Move DisconnectFromNetwork back to daemon/
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-03 20:10:27 +01:00
2f9b541b89
Merge pull request #18394 from thaJeztah/carry-17869-add-volume-driver
...
[Carry 17869] Add docs and man page entry for --volume-driver
2015-12-03 20:06:18 +01:00
867f432985
Move docker system information to a dedicated router and backend.
...
Because I like the name `system` better than `local` :)
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-03 13:38:56 -05:00
b9d30280f6
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>
2015-12-03 13:22:55 -05:00
c10311bc9a
Fix broken Windows CI
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 10:12:11 -08:00
d9755df2b3
Merge pull request #18391 from runcom/remove-daemon-config-func
...
daemon: remove private func config()
2015-12-03 11:42:31 -05:00
6bb0d1816a
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>
2015-12-03 17:39:49 +01:00
33ab2bb52c
Merge pull request #18266 from calavera/events_pub_sub
...
Event PubSub topics + linear filtering.
2015-12-03 17:11:40 +01:00
a2120e5ba3
Address review comments.
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-03 16:07:54 +01:00
fe3ec3f77f
Add docs and man page entry for --volume-driver
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-12-03 16:02:20 +01:00
3662f58083
daemon: remove private func config()
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-03 11:46:53 +01:00
1475f567cb
Merge pull request #18375 from vbatts/tar-split_update
...
vendor: update tar-split to v0.9.11
2015-12-02 20:25:07 -08:00
580534ba2e
Merge pull request #18231 from mqliang/resp
...
rename req to resp
2015-12-02 14:58:29 -08:00
434d2e8745
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>
2015-12-02 16:43:49 -05:00
ee3e07d359
Merge pull request #18301 from wenchma/doc_update_for_net
...
Add NETWORK_NAME_or_ID value for --net= option
2015-12-02 22:36:01 +01:00
295c27388d
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>
2015-12-02 22:32:10 +01:00
6deec021e5
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
2015-12-02 22:28:28 +01:00
61773e5cbf
Merge pull request #18376 from jfrazelle/fix-default-shm-size
...
fix default shm size in test
2015-12-02 12:54:07 -08:00
d410cd4751
Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
...
Carry 17293 add examples in search
2015-12-02 21:52:52 +01:00
4354b348ad
fix default shm size in test
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-02 12:43:51 -08:00
919104e6bb
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>
2015-12-02 15:34:12 -05:00
aa2ca5d93c
Merge pull request #18371 from sallyom/dontReturnNonError
...
don't return error if can't delete non-existing container
2015-12-02 11:59:50 -08:00
f8364c013d
Merge pull request #18369 from LK4D4/misleading_rm
...
daemon/delete.go: use less confusing naming of functions
2015-12-02 11:57:18 -08:00
8f1f53f735
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
2015-12-02 11:49:51 -08:00
f4176f9169
Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation
...
[carry] configuring DNS options on systemd
2015-12-02 11:39:18 -08:00
Phil Estes
Jess Frazelle
Sebastiaan van Stijn
Kristian Haugene
Alexander Morozov
Doug Davis
Ma Shimiao
Jessica Frazelle
Aaron Lehmann
Michael Crosby
Tonis Tiigi
David Calavera
John Howard
Tibor Vass
Tibor Vass
Sebastiaan van Stijn
Ben Firshman
Antonio Murdaca
Vincent Demeester
Vincent Batts
Arnaud Porterie
moxiegirl