docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
20,092 Commits 92 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

20092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux
41b2874b99 Merge pull request #5643 from crosbymichael/fix-native-pid 
Set container pid for process in native driver
 2014-05-06 18:02:55 -07:00
Michael Crosby
62e8ddb579 Set container pid for process in native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-06 17:04:04 -07:00
Sven Dowideit
cfb232cff2 update the docs to reflect the nice \n handling 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-05-07 09:40:49 +10:00
Victor Vieux
b622da3cfe improve some usages 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-06 21:32:12 +00:00
Victor Vieux
77098d5b5b use tabwriter to display usage in mflag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-06 21:31:21 +00:00
Sven Dowideit
d7166536e7 Merge pull request #5622 from SvenDowideit/net-host-docs 
Update the run --net cli help to include the 'host' option
 2014-05-07 07:11:41 +10:00
Michael Crosby
5c12a27838 Merge pull request #5631 from vmarmol/cpuacct-usage 
Export cpuacct CPU usage in total cores over the sampled period.
 2014-05-06 11:47:55 -07:00
Victor Vieux
8d07c2d1ae Fix logo in README.md 2014-05-06 11:39:11 -07:00
Vincent Batts
6f32727844 registry: adding vbatts to the MAINTAINERS 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-05-06 14:31:47 -04:00
Victor Marmol
543e60eb60 Export cpuacct CPU usage in total cores over the sampled period. 
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
 2014-05-06 16:56:39 +00:00
Michael Crosby
818648ff9f Merge pull request #5630 from rjnagal/libcontainer-fixes 
Check supplied hostname before using it.
 2014-05-06 09:49:52 -07:00
Michael Crosby
7e3a1b6521 Merge pull request #5629 from vmarmol/fix-systemd-softlimit 
Remove support for MemoryReservation in systemd systems.
 2014-05-06 09:48:33 -07:00
Michael Crosby
d16fcc628e Merge pull request #5627 from cyphar/integration-cli-fixes 
Fixed completely broken integration-cli tests
 2014-05-06 09:35:30 -07:00
Michael Crosby
5034b658e3 Merge pull request #5626 from cyphar/networkfs-etchosts-tests 
Fixed broken tests for pkg/networkfs/etchosts
 2014-05-06 09:31:06 -07:00
Victor Marmol
69d43b2674 Remove support for MemoryReservation in systemd systems. This has been 
deperecated since systemd 208.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
 2014-05-06 15:53:38 +00:00
cyphar
924979259e integration-cli: docker_cli_links: fixed broken tests 
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-05-07 01:05:15 +10:00
cyphar
14f65ab83b pkg: networkfs: etchosts: fixed tests 
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-05-07 00:42:22 +10:00
O.S. Tezer
ba6a732357 Merge pull request #5616 from nirvdrum/patch-2 
Use the contraction for "it is."
 2014-05-06 11:33:41 +01:00
Sven Dowideit
9eeff6d099 Update the run --net cli help to include the 'host' option 
and then add that to the run and cli docs

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-05-06 20:26:44 +10:00
O.S.Tezer
02f95a089c Add code for Pardot implementation to docs 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
 2014-05-06 09:53:19 +01:00
Solomon Hykes
95d81dada6 Merge pull request #5056 by Bryan Murphy <bmurphy1976@gmail.com> 
"add linked containers to hosts file"
 2014-05-05 20:04:01 -07:00
Solomon Hykes
dc605c8be7 Simplify integration test for link + hostname. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-05-05 19:51:47 -07:00
Bryan Murphy
53f38a14cd add linked containers to hosts file 
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-05-05 19:40:27 -07:00
Michael Crosby
cd81895091 Add alex as devmapper and btrfs maintainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 19:40:27 -07:00
Guillaume J. Charmes
839b06b121 Merge pull request #5601 from crosbymichael/alex-maintainer 
Add alex as devmapper and btrfs maintainer
 2014-05-05 17:10:05 -07:00
Kevin Menard
2b0f88383a Use the correct "it's." 2014-05-05 20:08:35 -04:00
Guillaume J. Charmes
affacfab08 Merge pull request #5614 from crosbymichael/move-attach-to-daemon 
Move Attach from container to daemon
 2014-05-05 16:56:11 -07:00
Michael Crosby
41cfaa738c Move Attach from container to daemon 
This moves the Attach method from the container to the daemon.  This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 16:48:56 -07:00
Victor Vieux
b4ac4228f5 Merge pull request #5613 from vieux/better_error_handling 
propagate errors write
 2014-05-05 16:28:15 -07:00
Victor Vieux
55f3e72d7f propagate errors write 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-05 23:23:14 +00:00
Guillaume J. Charmes
0b15944cb0 Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes 
cgroups: Update systemd to match fs backend
 2014-05-05 16:00:56 -07:00
Sven Dowideit
df5827dd02 Merge pull request #5597 from jamtur01/docs-simplify-osx-install 
Fixed the horrible OSX installation docs
 2014-05-06 08:55:14 +10:00
Victor Vieux
0736eb6d16 Merge pull request #5609 from crosbymichael/move-env-gen 2014-05-05 15:52:47 -07:00
Michael Crosby
ab58dd5a44 Merge pull request #5611 from vieux/networkfs_pkgs 
add 2 networkfs pkgs
 2014-05-05 15:52:14 -07:00
Victor Vieux
3744452ecf add resolvconf 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-05 22:55:32 +00:00
Victor Vieux
a1a029f6d7 add etchosts 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-05 22:43:38 +00:00
Victor Vieux
eadf004fcb Merge pull request #5600 from unclejack/sha512_registry_support 
import sha512 to make sha512 ssl certs work
 2014-05-05 15:27:11 -07:00
Michael Crosby
4994b0fe54 Move envconfig generation to lxc driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 14:45:14 -07:00
Victor Vieux
222605b5fb Merge pull request #5608 from crosbymichael/net-flag-refactor 
HOTFIX Update after namespace refactor
 2014-05-05 13:58:09 -07:00
Michael Crosby
01fec73ba4 Update after namespace refactor 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 13:56:18 -07:00
Guillaume J. Charmes
70fef1460a Merge pull request #4441 from crosbymichael/add-net-flag 
Add --net flag to docker run and allow host network stack
 2014-05-05 13:54:55 -07:00
Michael Crosby
2165a4993b Merge pull request #5602 from crosbymichael/libcontainer-enable 
Improve libcontainer namespace and cap format
 2014-05-05 13:50:08 -07:00
Victor Vieux
51933bd5e1 Merge pull request #5575 from vieux/pr-5428 2014-05-05 13:48:36 -07:00
Victor Vieux
7c3a06634b Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers 2014-05-05 13:48:11 -07:00
Victor Vieux
07db13509b Merge pull request #5596 from dotcloud/contrib-fix 
Post-commit hook URL fix
 2014-05-05 13:44:48 -07:00
Michael Crosby
99be235332 Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx 2014-05-05 13:41:43 -07:00
James Turnbull
13c1865541 Merge pull request #5604 from nirvdrum/patch-1 
It's its.
 2014-05-05 21:49:47 +02:00
Tianon Gravi
168452f9b0 Merge pull request #5580 from tianon/update-vendor-versions 
Update vendored deps that have a proper version number to use said specific versions
 2014-05-05 13:45:03 -06:00
Kevin Menard
b25208ee3e It's its. 2014-05-05 15:43:11 -04:00
Michael Crosby
db5f6b4aa0 Improve libcontainer namespace and cap format 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 12:34:21 -07:00