David Calavera
868f85b271
Merge pull request #15166 from tiborvass/carry-13934
...
Carry 13934: Add `docker daemon` to bash completion
2015-07-30 11:30:31 -07:00
Tibor Vass
c7a04fda2a
tlsconfig: better format for error message in tlsconfig
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 14:15:41 -04:00
Harald Albers
8cc8ee9254
Add docker daemon
to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 14:08:55 -04:00
Michael Crosby
bfc51cf660
Don't mount /proc as ro
...
This caused a regression with LSM labeling.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-07-30 10:57:50 -07:00
Tibor Vass
bfccd328be
Merge pull request #15100 from calavera/fix_reader_timeout
...
Fix reset timeout for buffer readers.
2015-07-30 13:18:06 -04:00
Doug Davis
18b1381335
Add missing typed error in truncindex
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-30 07:52:34 -07:00
Stefan Berger
9dbc36b441
contrib: Extend engine apparmor profile for tools needed by devicemapper
...
Add tools to the apparmor profile that are needed when -s devicemapper is
in the docker daemon's command line.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
2015-07-30 06:45:57 -04:00
Otto Kekäläinen
b619220ce1
Multiple fixes to 'docker stats' output:
...
* Add space between values in docker stats output for easier parsing
Old output could not be parsed easily because there were columns
that did not have any separator. Also values that are together
without any space is difficult to read even for humans.
* Update unit.HumanSize comment to match what the does actually does
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
2015-07-30 10:14:57 +03:00
Arnaud Porterie
f39987afe8
Merge pull request #15149 from Microsoft/10662-fixwindowscompile
...
[Blocking] Windows: Daemon build is currently broken
2015-07-29 22:46:11 -07:00
Sven Dowideit
26ff3bd2e9
Merge pull request #15066 from dwcramer/fix-broken-link
...
[#15027 ] Fix broken link and edit link text to match section heads
2015-07-30 13:37:29 +10:00
Sven Dowideit
cc45e027f1
Merge pull request #15071 from epc/epc-2015209
...
Docs: Copy edits for typos
2015-07-30 13:36:23 +10:00
John Howard
b43dc0d93c
Windows: Daemon build is broken
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-29 20:08:51 -07:00
root
cfeab585c0
fix golint errors/warnings of pkg api/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-07-30 09:46:25 +08:00
Qiang Huang
e34f562a77
Add back golint for daemon/execdriver/native
...
It's broken by #15099 Fix it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-30 08:58:54 +08:00
Arnaud Porterie
4c7cf30260
Merge pull request #15126 from LK4D4/global_rand
...
Use global random *rand.Rand instance in pkg
2015-07-29 17:36:25 -07:00
Arnaud Porterie
b71cf69380
Merge pull request #15132 from LK4D4/improve_test
...
Fix message and add additional check to test
2015-07-29 17:36:11 -07:00
Tibor Vass
6adb64e113
Merge pull request #14773 from runcom/cleanup-links
...
Cleanup links top level pkg
2015-07-29 20:17:44 -04:00
Arnaud Porterie
d94aeb2876
Merge pull request #14980 from jlhawn/build_tag_resolved_digests
...
[api/client] Tag resolved digest from Dockerfile
2015-07-29 16:52:14 -07:00
Michael Crosby
887882c2b6
Merge pull request #15142 from calavera/add_field_comment_back
...
Add MemorySwappiness comment back.
2015-07-29 16:51:49 -07:00
Arnaud Porterie
8724e8953d
Merge pull request #15040 from vbatts/vbatts-double-decompress-fix
...
archive, graphdriver: double decompress fix
2015-07-29 16:48:02 -07:00
Arnaud Porterie
4a71323ec3
Merge pull request #15098 from calavera/backwards_compat_kill_error
...
Keep backwards compatibility in kill api.
2015-07-29 16:42:36 -07:00
Arnaud Porterie
3f5ea1bb80
Merge pull request #15090 from dmcgowan/fix-login-tls-config
...
Fix login and search TLS configuration
2015-07-29 16:42:13 -07:00
David Calavera
f41f62b6cc
Add MemorySwappiness comment back.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-29 16:41:46 -07:00
Arnaud Porterie
de50082000
Merge pull request #15134 from calavera/swappiness_big_int
...
Use pointer for MemorySwappiness.
2015-07-29 16:31:15 -07:00
Jessie Frazelle
2ae174e491
Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined
...
Fix the proc integration test & include missing AA profile
2015-07-29 15:32:13 -07:00
Tibor Vass
28ac78c02f
Merge pull request #15139 from tiborvass/fix-uuid-loggerf
...
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
2015-07-29 18:17:54 -04:00
Jessie Frazelle
75f8bdd970
Merge pull request #13542 from kvasdopil/freebsd-work
...
Make docker build on FreeBSD
2015-07-29 15:15:37 -07:00
Tibor Vass
6a274e48dc
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
2015-07-29 18:09:46 -04:00
Tibor Vass
28b79e4a84
Merge pull request #14827 from brahmaroutu/lint_graph
...
/graph fix lint errors/warnings
2015-07-29 18:08:09 -04:00
Tibor Vass
7841d6ab9a
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-29 17:49:59 -04:00
Eric Windisch
0f4e5f7149
Remove container AA profile from packaging
...
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 17:47:38 -04:00
Antonio Murdaca
0e0c7e521c
Cleanup links top level pkg
...
- Move top level pkg links under daemon
- Refactor code accordingly
- golint pkg
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-29 23:39:18 +02:00
Avi Miller
5c6446f335
Fix for #14924 . Seperates lsb_dist detection from dist_version detection
...
so that the latter can be distro specific.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-30 07:30:51 +10:00
David Calavera
4e25d2982b
Use *int64 for MemorySwappiness.
...
So we marshal/unmarshal its value properly when it's empty.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-29 14:14:04 -07:00
Eric Windisch
5832715052
Fix the proc integration test & include missing AA profile
...
Integration tests were failing due to proc filter behavior
changes with new apparmor policies.
Also include the missing docker-unconfined policy resolving
potential startup errors. This policy is complain-only so
it should behave identically to the standard unconfined policy,
but will not apply system path-based policies within containers.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 17:08:51 -04:00
Srini Brahmaroutu
1d6e443119
/graph fix lin errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-29 20:59:36 +00:00
Morgan Bauer
ccbe539e86
golint fixes for daemon/logger/*
...
- downcase and privatize exported variables that were unused
- make accurate an error message
- added package comments
- remove unused var ReadLogsNotSupported
- enable linter
- some spelling corrections
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-29 13:09:39 -07:00
Alexander Morozov
0f85fadb4e
Merge pull request #15133 from dmcgowan/notary-fix-test-date
...
Skip notary tests which update system clock
2015-07-29 12:51:05 -07:00
Derek McGowan
bf3c1e6a3a
Skip notary tests which update system clock
...
Currently some notary tests change the system clock to check for expiration.
Skip these tests until the code can be refactored to not rely on updating the system clock.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-29 12:09:40 -07:00
Tibor Vass
0bab97fcba
Merge pull request #15076 from hqhq/hq_merge_daemon_test
...
Merge daemon_unit_test.go to daemon_test.go
2015-07-29 14:53:34 -04:00
Tibor Vass
c09c497c71
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
2015-07-29 14:48:19 -04:00
Alexander Morozov
0d09439ace
Fix message and add additional check to TestBuildContainerWithCgroupParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-29 11:46:33 -07:00
Tibor Vass
2a593bea12
Merge pull request #15116 from ibuildthecloud/devices
...
Revert change to make ParseDevice unexported
2015-07-29 14:42:30 -04:00
Alexey Guskov
26c03d561a
make docker compile on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-07-29 21:25:56 +03:00
Tibor Vass
0a2ec227f8
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
2015-07-29 14:20:34 -04:00
Tibor Vass
e77ea5aa7a
Merge pull request #14784 from brahmaroutu/lint_api_client
...
fix golint errors/warnings
2015-07-29 14:04:45 -04:00
David Calavera
1cfae07a6e
Merge pull request #15015 from runcom/14911-fix-install-script-debian81
...
Fix install script to handle debian 8.1 apt repo string
2015-07-29 10:45:50 -07:00
Tibor Vass
dfcdde4d98
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
2015-07-29 13:29:57 -04:00
root
929f2c2f40
api/client fix golint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-29 17:20:54 +00:00
Tibor Vass
2cd058ce4f
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
2015-07-29 13:09:31 -04:00