centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-03 09:49:05 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,335 Commits 55 Branches 28 Tags
044b56e94fcb1def77efda36a2cf60f97e82e866
Commit Graph

17335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
044b56e94f Merge pull request #15174 from Microsoft/10662-top 
Windows: Top (non-)implementation
 2015-07-30 19:49:15 -04:00
Eric Windisch
f8f4deb0b2 Merge pull request #15154 from stefanberger/apparmor-engine 
contrib: Extend engine apparmor profile for tools needed by devicemapper
 2015-07-30 19:22:28 -04:00
Jessie Frazelle
5b65284649 Merge pull request #15103 from Djelibeybi/fix14924 
Seperate lsb_dist detection from dist_version detection
 2015-07-30 16:21:35 -07:00
David Calavera
c1e2e4d9c6 Merge pull request #15176 from Microsoft/10662-removesometodos 
Windows: Remove some TODOs
 2015-07-30 15:26:06 -07:00
David Calavera
86a6e4914f Merge pull request #14922 from rhatdan/netlabel 
Label /etc/resolv.conf, /etc/hosts ... correctly in shared network co…
 2015-07-30 15:03:49 -07:00
John Howard
f50b916ca6 Windows: Remove some TODOs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-30 14:46:51 -07:00
Tibor Vass
5c9e5bfb0f Merge pull request #15106 from jgkamat/links 
Fix a couple broken links
 2015-07-30 17:28:11 -04:00
John Howard
0a9ec21818 Windows: Top (non-)implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-30 14:25:15 -07:00
Tibor Vass
41d9270a40 Merge pull request #15170 from runcom/i-like-cleaning 
Remove HostConfig,SetHostConfig from daemon.container
 2015-07-30 17:23:58 -04:00
Alexander Morozov
8505183252 Merge pull request #14950 from ottok/master 
Multiple fixes to 'docker stats' output
 2015-07-30 14:02:35 -07:00
David Calavera
030f61df3d Merge pull request #14885 from jlhawn/fix_cp_symlink 
Fix copying of symlinks in containers
 2015-07-30 13:42:40 -07:00
Alexander Morozov
9431acbc0a Merge pull request #15169 from Microsoft/10662-tidydiff 
Tidy platform common bits in diff
 2015-07-30 13:42:27 -07:00
Antonio Murdaca
f95333010e Remove HostConfig,SetHostConfig from daemon.container 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-30 22:25:31 +02:00
John Howard
5ab9654bc4 Tidy platform common bits in diff 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-30 13:04:49 -07:00
Tibor Vass
2f1a7c903f Merge pull request #14844 from WeiZhang555/golint-api 
fix golint errors/warnings of pkg api/
 2015-07-30 16:02:06 -04:00
Alexander Morozov
75c082c4b2 Merge pull request #15168 from Microsoft/10662-daemonconfiglocation 
Windows: [TP3] Move daemon config directory
 2015-07-30 12:56:52 -07:00
Tibor Vass
2d730c93b4 Merge pull request #15148 from hqhq/hq_golint_native 
Add back golint for daemon/execdriver/native
 2015-07-30 15:51:06 -04:00
John Howard
9ed4400baf Windows: Move daemon config directory 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-30 12:39:19 -07:00
Josh Hawn
75f6929b44 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)
 2015-07-30 12:14:28 -07:00
Tibor Vass
a687448c4d Merge pull request #15163 from crosbymichael/proc-ro 
Don't mount /proc as ro
 2015-07-30 15:12:29 -04:00
Tibor Vass
5fa26e3df8 Merge pull request #15161 from ewindisch/fix-netns 
Only explicitly deny ptrace for container-originated procs
 2015-07-30 15:11:12 -04:00
Brian Goff
b149d9d0d9 Merge pull request #15156 from duglin/AddErrTruncIndex 
Add missing typed error in truncindex
 2015-07-30 14:55:40 -04:00
Tibor Vass
06668de15e Merge pull request #15167 from tiborvass/better-tlsconf-error-msg 
tlsconfig: better format for error message in tlsconfig
 2015-07-30 14:51:35 -04:00
Eric Windisch
f5c388b35a 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>
 2015-07-30 14:40:28 -04:00
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