83f49872fa
Merge pull request #15161 from ewindisch/fix-netns
...
Only explicitly deny ptrace for container-originated procs
Upstream-commit: 5fa26e3df880533a10f6ff31983aa91d59f12a9e
Component: engine
2015-07-30 15:11:12 -04:00
bded7814ff
Merge pull request #15156 from duglin/AddErrTruncIndex
...
Add missing typed error in truncindex
Upstream-commit: b149d9d0d9b3e784ee16c6ebc4fb4faceb19e703
Component: engine
2015-07-30 14:55:40 -04:00
0d1ac361a5
Merge pull request #15167 from tiborvass/better-tlsconf-error-msg
...
tlsconfig: better format for error message in tlsconfig
Upstream-commit: 06668de15ed695f64aa51ee6af1915e005cd4d1d
Component: engine
2015-07-30 14:51:35 -04:00
114011a355
Only explicitly deny ptrace for container-originated procs
...
The 'deny ptrace' statement was supposed to only ignore
ptrace failures in the AUDIT log. However, ptrace was implicitly
allowed from unconfined processes (such as the docker daemon and
its integration tests) due to the abstractions/base include.
This rule narrows the definition such that it will only ignore
the failures originating inside of the container and will not
cause denials when the daemon or its tests ptrace inside processes.
Introduces positive and negative tests for ptrace /w apparmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: f5c388b35a9ddd699b3dbbe85b80fa02234f8355
Component: engine
2015-07-30 14:40:28 -04:00
7efd312a12
Merge pull request #15166 from tiborvass/carry-13934
...
Carry 13934: Add `docker daemon` to bash completion
Upstream-commit: 868f85b2717acc493a0f175effc9f8bc02351b7f
Component: engine
2015-07-30 11:30:31 -07:00
3f75e1a44a
tlsconfig: better format for error message in tlsconfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c7a04fda2ad804601385f054c19b69cf43fcfe46
Component: engine
2015-07-30 14:15:41 -04:00
a6f038e8ac
Add docker daemon to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8cc8ee9254ead6ba5e4f708d7a04ac88a74ccb0a
Component: engine
2015-07-30 14:08:55 -04:00
6d2e92af9b
Merge pull request #15100 from calavera/fix_reader_timeout
...
Fix reset timeout for buffer readers.
Upstream-commit: bfccd328be0842806eb65d80768becbb433b7772
Component: engine
2015-07-30 13:18:06 -04:00
8e069cb4e8
Add missing typed error in truncindex
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 18b13813358f9cb9f3028f34f59ed254bd16bb3f
Component: engine
2015-07-30 07:52:34 -07:00
52ef2235bf
Merge pull request #15149 from Microsoft/10662-fixwindowscompile
...
[Blocking] Windows: Daemon build is currently broken
Upstream-commit: f39987afe8d611407887b3094c03d6ba6a766a67
Component: engine
2015-07-29 22:46:11 -07:00
d28ea90e30
Merge pull request #15066 from dwcramer/fix-broken-link
...
[#15027 ] Fix broken link and edit link text to match section heads
Upstream-commit: 26ff3bd2e92ab561f297f7fb84eb8ee7898907d8
Component: engine
2015-07-30 13:37:29 +10:00
b35bdd7bb1
Merge pull request #15071 from epc/epc-2015209
...
Docs: Copy edits for typos
Upstream-commit: cc45e027f1a91f9b033d501aff3d2a6024ecb904
Component: engine
2015-07-30 13:36:23 +10:00
9abcd15501
Windows: Daemon build is broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b43dc0d93c3678c3fe5e6247aa19a2bf71ef35d6
Component: engine
2015-07-29 20:08:51 -07:00
01ea6979df
Merge pull request #15126 from LK4D4/global_rand
...
Use global random *rand.Rand instance in pkg
Upstream-commit: 4c7cf30260eac73f8bfe31fcc4450216965e224c
Component: engine
2015-07-29 17:36:25 -07:00
513c7293de
Merge pull request #15132 from LK4D4/improve_test
...
Fix message and add additional check to test
Upstream-commit: b71cf6938040fc4ae190f3e7eb24d51f756c9e11
Component: engine
2015-07-29 17:36:11 -07:00
8521089b9c
Merge pull request #14773 from runcom/cleanup-links
...
Cleanup links top level pkg
Upstream-commit: 6adb64e1130f32fa6da9c1f95faaffbb9940c079
Component: engine
2015-07-29 20:17:44 -04:00
683390e0bc
Merge pull request #14980 from jlhawn/build_tag_resolved_digests
...
[api/client] Tag resolved digest from Dockerfile
Upstream-commit: d94aeb28765635970e7cac605b85785212855438
Component: engine
2015-07-29 16:52:14 -07:00
254f9e966b
Merge pull request #15142 from calavera/add_field_comment_back
...
Add MemorySwappiness comment back.
Upstream-commit: 887882c2b6856eb06baa3ccefd5c3bc7e2a6feed
Component: engine
2015-07-29 16:51:49 -07:00
197e6f60b8
Merge pull request #15040 from vbatts/vbatts-double-decompress-fix
...
archive, graphdriver: double decompress fix
Upstream-commit: 8724e8953d446ade61856d4944126ffccb2aead9
Component: engine
2015-07-29 16:48:02 -07:00
1bd0671e56
Merge pull request #15098 from calavera/backwards_compat_kill_error
...
Keep backwards compatibility in kill api.
Upstream-commit: 4a71323ec3c00be48e3539a1da0444972f22c355
Component: engine
2015-07-29 16:42:36 -07:00
ea37f593a8
Merge pull request #15090 from dmcgowan/fix-login-tls-config
...
Fix login and search TLS configuration
Upstream-commit: 3f5ea1bb8063d060e63040df6a6d11cf9f3619b5
Component: engine
2015-07-29 16:42:13 -07:00
5db6cfa390
Add MemorySwappiness comment back.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f41f62b6cc70a6afa533d11804d59d8bf5218ed8
Component: engine
2015-07-29 16:41:46 -07:00
24b9b89f5c
Merge pull request #15134 from calavera/swappiness_big_int
...
Use pointer for MemorySwappiness.
Upstream-commit: de500820000295cc339cdd843096c27bc47ccc96
Component: engine
2015-07-29 16:31:15 -07:00
c5fec26f40
Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined
...
Fix the proc integration test & include missing AA profile
Upstream-commit: 2ae174e491a366c4663b4f6ecee83cd6f64bcc3f
Component: engine
2015-07-29 15:32:13 -07:00
18ba2e91f3
Merge pull request #15139 from tiborvass/fix-uuid-loggerf
...
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
Upstream-commit: 28ac78c02f502858a243982fa84995bb389427a3
Component: engine
2015-07-29 18:17:54 -04:00
4cd45101c0
Merge pull request #13542 from kvasdopil/freebsd-work
...
Make docker build on FreeBSD
Upstream-commit: 75f8bdd970e5355a6238e7b41a9f1aee9cd3f890
Component: engine
2015-07-29 15:15:37 -07:00
22c6edd13b
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
Upstream-commit: 6a274e48dc645f0ea02ae8bf59ce08ff22cfd663
Component: engine
2015-07-29 18:09:46 -04:00
beb00e92aa
Merge pull request #14827 from brahmaroutu/lint_graph
...
/graph fix lint errors/warnings
Upstream-commit: 28b79e4a84f7b2e211324ff068657295a9d89dc7
Component: engine
2015-07-29 18:08:09 -04:00
74a4e76af0
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 7841d6ab9a58aff1d607eea7303c665c159ceaec
Component: engine
2015-07-29 17:49:59 -04:00
c5f3d6fd5b
Remove container AA profile from packaging
...
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 0f4e5f71491abc0e7c4f4effe1f3c59aa9bf6a33
Component: engine
2015-07-29 17:47:38 -04:00
ddcb599dbb
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 >
Upstream-commit: 0e0c7e521c996bc18a9e602122135b07d4d4469e
Component: engine
2015-07-29 23:39:18 +02:00
10b5ce2263
Use *int64 for MemorySwappiness.
...
So we marshal/unmarshal its value properly when it's empty.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4e25d2982b3af25bf55b8bc788d4604f7b539ea4
Component: engine
2015-07-29 14:14:04 -07:00
36993f8dbd
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 >
Upstream-commit: 5832715052e9e165cc40a5ac8178fa62685985aa
Component: engine
2015-07-29 17:08:51 -04:00
e1b2148585
/graph fix lin errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 1d6e44311916b26e1cd128e96ea9f0e5ede5f9df
Component: engine
2015-07-29 20:59:36 +00:00
90287c6171
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 >
Upstream-commit: ccbe539e86dfbb8749c09763ddfd73bf10ac57cc
Component: engine
2015-07-29 13:09:39 -07:00
4e9957ee2d
Merge pull request #15133 from dmcgowan/notary-fix-test-date
...
Skip notary tests which update system clock
Upstream-commit: 0f85fadb4ec1aa3d0270351fc72fa9a70cffd3b9
Component: engine
2015-07-29 12:51:05 -07:00
4c1bdea55d
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)
Upstream-commit: bf3c1e6a3afc951e41643b8d55d4ac25fa9cb06d
Component: engine
2015-07-29 12:09:40 -07:00
4126b923f8
Merge pull request #15076 from hqhq/hq_merge_daemon_test
...
Merge daemon_unit_test.go to daemon_test.go
Upstream-commit: 0bab97fcba8d2b4be1650fef381926e6b0259cc5
Component: engine
2015-07-29 14:53:34 -04:00
abf825af14
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
Upstream-commit: c09c497c71e3fbcec6fee6ee0f4eb5097fc1b4b7
Component: engine
2015-07-29 14:48:19 -04:00
6f4ce090eb
Fix message and add additional check to TestBuildContainerWithCgroupParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0d09439acea2ee1886d301c03e5e33abf8735896
Component: engine
2015-07-29 11:46:33 -07:00
78b8a7e21c
Merge pull request #15116 from ibuildthecloud/devices
...
Revert change to make ParseDevice unexported
Upstream-commit: 2a593bea12f2f4a93e2d1da93fba3707d476a368
Component: engine
2015-07-29 14:42:30 -04:00
59df5a01ec
make docker compile on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 26c03d561ab126287bb3034cc23477d18869a888
Component: engine
2015-07-29 21:25:56 +03:00
a14f132348
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
Upstream-commit: 0a2ec227f89d602f73867cae14bab0294d32fe20
Component: engine
2015-07-29 14:20:34 -04:00
86cfb16a84
Merge pull request #14784 from brahmaroutu/lint_api_client
...
fix golint errors/warnings
Upstream-commit: e77ea5aa7aee20bc29b65efd92e9960b58db3435
Component: engine
2015-07-29 14:04:45 -04:00
61d8e3e275
Merge pull request #15015 from runcom/14911-fix-install-script-debian81
...
Fix install script to handle debian 8.1 apt repo string
Upstream-commit: 1cfae07a6e04cc0158142afa37a1a758f83aeecb
Component: engine
2015-07-29 10:45:50 -07:00
307e5a8a1e
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
Upstream-commit: dfcdde4d9832adb5bbee146cdf5fac2cc5926b4f
Component: engine
2015-07-29 13:29:57 -04:00
36ee6380c9
api/client fix golint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 929f2c2f4074e66bb1e942a338e4d2a815096d45
Component: engine
2015-07-29 17:20:54 +00:00
4c4cfdbd2e
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
Upstream-commit: 2cd058ce4f022f98be22c780a703d93b51722d19
Component: engine
2015-07-29 13:09:31 -04:00
da80514353
Merge pull request #15129 from jfrazelle/golint
...
fix linnt
Upstream-commit: 8a8de53d3d3062e3f5b0fe523d4e366825399985
Component: engine
2015-07-29 10:07:25 -07:00
9da89dbbd1
Doc fixes in logger, update NewCopier method
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 41d85c014defd96cda06abac73554d9f9d1de0d8
Component: engine
2015-07-29 10:05:46 -07:00
