d1ebdf9030
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b0af811272c7cf9d7694ab5a21ded776a46a7d7a
Component: engine
2015-07-30 16:38:51 -07:00
5a700e39a6
Merge pull request #15154 from stefanberger/apparmor-engine
...
contrib: Extend engine apparmor profile for tools needed by devicemapper
Upstream-commit: f8f4deb0b2c52d97322a9c66d05ee8d4d8a4d665
Component: engine
2015-07-30 19:22:28 -04:00
1c2351b5fa
Merge pull request #15103 from Djelibeybi/fix14924
...
Seperate lsb_dist detection from dist_version detection
Upstream-commit: 5b65284649c6cb614a40d6112096ac28a3488e75
Component: engine
2015-07-30 16:21:35 -07:00
15e0190adc
Merge pull request #15176 from Microsoft/10662-removesometodos
...
Windows: Remove some TODOs
Upstream-commit: c1e2e4d9c69649e502a6099144763a75f5ea6212
Component: engine
2015-07-30 15:26:06 -07:00
c1a15a2b27
Merge pull request #14922 from rhatdan/netlabel
...
Label /etc/resolv.conf, /etc/hosts ... correctly in shared network co…
Upstream-commit: 86a6e4914f761188dd4495810d7901ced778f438
Component: engine
2015-07-30 15:03:49 -07:00
3da5dccbd9
Windows: Remove some TODOs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f50b916ca6cce410f3b1bbd5250fb9ba2a7942a6
Component: engine
2015-07-30 14:46:51 -07:00
15d762cf3c
Merge pull request #15106 from jgkamat/links
...
Fix a couple broken links
Upstream-commit: 5c9e5bfb0f9006f6c7ec98bc26cfd9f6889b459a
Component: engine
2015-07-30 17:28:11 -04:00
05325c6d3a
Merge pull request #15170 from runcom/i-like-cleaning
...
Remove HostConfig,SetHostConfig from daemon.container
Upstream-commit: 41d9270a40469a3226261285525c6696fd996bed
Component: engine
2015-07-30 17:23:58 -04:00
0c28668f97
Merge pull request #14950 from ottok/master
...
Multiple fixes to 'docker stats' output
Upstream-commit: 85051832522ca217401d6eb4ddda1b1a7fdce9ad
Component: engine
2015-07-30 14:02:35 -07:00
a55bf4a409
Merge pull request #14885 from jlhawn/fix_cp_symlink
...
Fix copying of symlinks in containers
Upstream-commit: 030f61df3db2c053d68aacddc2c6893db3dee6ce
Component: engine
2015-07-30 13:42:40 -07:00
2f014c412e
Merge pull request #15169 from Microsoft/10662-tidydiff
...
Tidy platform common bits in diff
Upstream-commit: 9431acbc0ab819ba3040b680e8ca05318c9c9156
Component: engine
2015-07-30 13:42:27 -07:00
12be4fa37a
Remove HostConfig,SetHostConfig from daemon.container
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f95333010e1c036ac33d75f5271af1f2b03a276e
Component: engine
2015-07-30 22:25:31 +02:00
7a72702c89
Tidy platform common bits in diff
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5ab9654bc4ebcf49f95c91e16ecb09bbe7779b50
Component: engine
2015-07-30 13:04:49 -07:00
c7e78a7a31
Merge pull request #14844 from WeiZhang555/golint-api
...
fix golint errors/warnings of pkg api/
Upstream-commit: 2f1a7c903f163b3d85c96683971aaad4a24585d7
Component: engine
2015-07-30 16:02:06 -04:00
af1a68305d
Merge pull request #15168 from Microsoft/10662-daemonconfiglocation
...
Windows: [TP3] Move daemon config directory
Upstream-commit: 75c082c4b208fbba6608e7a5ea4959885d122f5a
Component: engine
2015-07-30 12:56:52 -07:00
f32fe35a14
Merge pull request #15148 from hqhq/hq_golint_native
...
Add back golint for daemon/execdriver/native
Upstream-commit: 2d730c93b4010b314f5365b22810823201ea1d58
Component: engine
2015-07-30 15:51:06 -04:00
76d46c7e63
Windows: Move daemon config directory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ed4400baf21528644c608eeda24fda081dfc4f2
Component: engine
2015-07-30 12:39:19 -07:00
0a7e55f30a
Fix docker cp Behavior With Symlinks
...
[pkg/archive] Update archive/copy path handling
- Remove unused TarOptions.Name field.
- Add new TarOptions.RebaseNames field.
- Update some of the logic around path dir/base splitting.
- Update some of the logic behind archive entry name rebasing.
[api/types] Add LinkTarget field to PathStat
[daemon] Fix stat, archive, extract of symlinks
These operations *should* resolve symlinks that are in the path but if the
resource itself is a symlink then it *should not* be resolved. This patch
puts this logic into a common function `resolvePath` which resolves symlinks
of the path's dir in scope of the container rootfs but does not resolve the
final element of the path. Now archive, extract, and stat operations will
return symlinks if the path is indeed a symlink.
[api/client] Update cp path hanling
[docs/reference/api] Update description of stat
Add the linkTarget field to the header of the archive endpoint.
Remove path field.
[integration-cli] Fix/Add cp symlink test cases
Copying a symlink should do just that: copy the symlink NOT
copy the target of the symlink. Also, the resulting file from
the copy should have the name of the symlink NOT the name of
the target file.
Copying to a symlink should copy to the symlink target and not
modify the symlink itself.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 75f6929b449a59335572436862d644afacf55cdb
Component: engine
2015-07-30 12:14:28 -07:00
76f950f781
Merge pull request #15163 from crosbymichael/proc-ro
...
Don't mount /proc as ro
Upstream-commit: a687448c4dec200336ed28c5ef26c8198cc0505b
Component: engine
2015-07-30 15:12:29 -04:00
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
8461105dc9
Don't mount /proc as ro
...
This caused a regression with LSM labeling.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: bfc51cf6605ebcf7a4ec791fb0f3b5ae7b05c6fd
Component: engine
2015-07-30 10:57:50 -07: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
2019ed6eb5
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 >
Upstream-commit: 9dbc36b44146c82804206c1240b94216b69c740e
Component: engine
2015-07-30 06:45:57 -04:00
eaafbe08a2
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 >
Upstream-commit: b619220ce11770ffaea068b54d3975c74f7c24f9
Component: engine
2015-07-30 10:14:57 +03: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
cebd8dac4d
fix golint errors/warnings of pkg api/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: cfeab585c0e831ef073c689c065a52b84ae08761
Component: engine
2015-07-30 09:46:25 +08:00
639fd1d44b
Add back golint for daemon/execdriver/native
...
It's broken by #15099 Fix it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e34f562a77276516b81756e9ea620a1625c49093
Component: engine
2015-07-30 08:58:54 +08: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
