cc45e027f1
Merge pull request #15071 from epc/epc-2015209
...
Docs: Copy edits for typos
2015-07-30 13:36:23 +10:00
b43dc0d93c
Windows: Daemon build is broken
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-29 20:08:51 -07:00
cfeab585c0
fix golint errors/warnings of pkg `api/`
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-07-30 09:46:25 +08:00
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
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
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
6adb64e113
Merge pull request #14773 from runcom/cleanup-links
...
Cleanup links top level pkg
2015-07-29 20:17:44 -04:00
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
887882c2b6
Merge pull request #15142 from calavera/add_field_comment_back
...
Add MemorySwappiness comment back.
2015-07-29 16:51:49 -07:00
8724e8953d
Merge pull request #15040 from vbatts/vbatts-double-decompress-fix
...
archive, graphdriver: double decompress fix
2015-07-29 16:48:02 -07:00
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
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
f41f62b6cc
Add MemorySwappiness comment back.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-29 16:41:46 -07:00
de50082000
Merge pull request #15134 from calavera/swappiness_big_int
...
Use pointer for MemorySwappiness.
2015-07-29 16:31:15 -07:00
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
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
75f8bdd970
Merge pull request #13542 from kvasdopil/freebsd-work
...
Make docker build on FreeBSD
2015-07-29 15:15:37 -07:00
6a274e48dc
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
2015-07-29 18:09:46 -04:00
28b79e4a84
Merge pull request #14827 from brahmaroutu/lint_graph
...
/graph fix lint errors/warnings
2015-07-29 18:08:09 -04:00
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
0f4e5f7149
Remove container AA profile from packaging
...
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 17:47:38 -04:00
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
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
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
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
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
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
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
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
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
c09c497c71
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
2015-07-29 14:48:19 -04:00
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
2a593bea12
Merge pull request #15116 from ibuildthecloud/devices
...
Revert change to make ParseDevice unexported
2015-07-29 14:42:30 -04:00
26c03d561a
make docker compile on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-07-29 21:25:56 +03:00
0a2ec227f8
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
2015-07-29 14:20:34 -04:00
e77ea5aa7a
Merge pull request #14784 from brahmaroutu/lint_api_client
...
fix golint errors/warnings
2015-07-29 14:04:45 -04:00
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
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
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
2cd058ce4f
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
2015-07-29 13:09:31 -04:00
8a8de53d3d
Merge pull request #15129 from jfrazelle/golint
...
fix linnt
2015-07-29 10:07:25 -07:00
41d85c014d
Doc fixes in logger, update NewCopier method
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-29 10:05:46 -07:00
c2c9e99d84
fix linnt
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-29 10:05:30 -07:00
2bf73c4b1a
Fix log to logrus
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-29 09:58:07 -07:00
4742a3964f
Prefer crypto rand seed for pkg/rand
...
Crypto rand is a much better seed for math/rand than
time. In the event we use math/rand where we should not,
this will make it a safer source of random numbers.
Although potentially dangerous, this will still fallback
to time should crypto/rand for any reason fail.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 12:55:57 -04:00
90b8cebda6
Labels on network content need to be shared if shared network namespace
...
If I run two containers with the same network they share the same /etc/resolv.conf.
The current code changes the labels of the /etc/resolv.conf currently to the
private label which causes it to be unusable in the first container.
This patch changes the labels to a shared label if more then one container
will use the content.
Docker-DCO-1.1-Signed-off-by: Dan Walsh dwalsh@redhat.com (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-07-29 12:42:28 -04:00
d7661cb48b
Merge pull request #15099 from ewindisch/apparmor-restore-en
...
Restore AppArmor generation + fixes
2015-07-29 09:36:59 -07:00
51cdcf3c9d
Use global random *rand.Rand instance in pkg
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-29 09:30:48 -07:00
9d3ad6d892
Merge pull request #15107 from LK4D4/unsafe_random
...
Use non-crypto version of random to generate ids.
2015-07-29 11:47:38 -04:00
0c330a7823
Merge pull request #15064 from jfrazelle/14590-fix-sudo
...
sh -c the cat repo for yum
2015-07-29 10:02:27 -04:00
Sven Dowideit
John Howard
root
Qiang Huang
Arnaud Porterie
Tibor Vass
Michael Crosby
David Calavera
Jessie Frazelle
Tibor Vass
Eric Windisch
Antonio Murdaca
Avi Miller
Srini Brahmaroutu
Morgan Bauer
Alexander Morozov
Derek McGowan
Alexander Morozov
Alexey Guskov
root
Ankush Agarwal
Jessica Frazelle
Dan Walsh