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
8,040 Commits 92 Branches 28 Tags
ed00ba84acfaefe9d2dd67dd5b186842990e049a
Commit Graph

8040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume J. Charmes
ed00ba84ac Merge pull request #5667 from bitness/typo-fix 
Fix error name typo (ErrInvalidWorikingDirectory)
 2014-05-07 16:53:08 -07:00
Guillaume J. Charmes
c7712b350a Merge pull request #5665 from vieux/fix_auth_issue 
Fix auth issue
 2014-05-07 16:36:07 -07:00
Lars R. Damerow
d3150e0927 Fix error name typo (ErrInvalidWorikingDirectory) 
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us> (github: bitness)
 2014-05-07 16:28:51 -07:00
Victor Vieux
2aff119baa Revert "refactor build job to know only configFile" 
This reverts commit b9731bccf2.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-07 22:59:13 +00:00
Victor Vieux
331e77f9ed Revert "rename configFile to auth in the job" 
This reverts commit e9c3e39743.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-07 22:58:09 +00:00
Michael Crosby
93f5d539fe Merge pull request #5660 from crosbymichael/merge_release_v0.11.0 
Merge release to master v0.11.0
 2014-05-07 11:42:49 -07:00
Michael Crosby
1ed63f1d16 Change version to v0.11.0-dev 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-07 11:38:02 -07:00
Michael Crosby
b68e0078c2 Merge branch 'release' into merge_release_v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-07 11:37:32 -07:00
Michael Crosby
57aa2f2ef4 Merge pull request #5640 from crosbymichael/bump_v0.11.0 
Bump version to v0.11.0
 2014-05-07 11:35:20 -07:00
Michael Crosby
15209c380c Bump version to v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-07 09:59:55 -07:00
Tianon Gravi
ddd0470ed1 Merge pull request #5642 from jmccrohan/master 
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
 2014-05-07 09:45:22 -06:00
Jonathan McCrohan
9e64a4d862 mkimage-debootstrap: set ubuntuLatestLTS as Trusty 
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
 2014-05-07 08:26:24 +01:00
Sven Dowideit
bd9b27fe18 Merge pull request #5634 from vieux/improve_mflag_usage 
Add support for \n in usages
 2014-05-07 13:53:04 +10:00
Victor Vieux
275faf06e8 Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs 
update the docs for the new \n rendering
 2014-05-06 19:54:47 -07:00
Michael Crosby
263d134fff Merge branch 'master' into bump_v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-06 18:03:23 -07:00
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
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
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