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
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Crosby
34e09afa24 Merge pull request #5544 from vieux/cleanup_api_client 
Cleanup api client
 2014-05-05 11:16:57 -07:00
Rohit Jnagal
412324cfbe Check supplied hostname before using it. 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
 2014-05-05 18:12:25 +00:00
Alexander Larsson
5b094530c0 cgroups: Update systemd to match fs backend 
This updates systemd.Apply to match the fs backend by:
* Always join blockio controller (for stats)
* Support CpusetCpus
* Support MemorySwap

Also, it removes the generic UnitProperties in favour of a single
option to set the slice.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-05-05 20:06:44 +02:00
Michael Crosby
f2d7c77c63 Add alex as devmapper and btrfs maintainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:47:55 -07:00
Michael Crosby
e3d6898da1 Merge pull request #5591 from alexlarsson/fix-expose-parsing 
nat: Fix --expose protocol parsing
 2014-05-05 10:32:26 -07:00
unclejack
7da186c3e5 import sha512 to make sha512 ssl certs work 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-05-05 20:29:20 +03:00
Guillaume J. Charmes
5f301191cf Merge pull request #5496 from unclejack/check_if_root 
check if the daemon is run as root on startup
 2014-05-05 10:13:17 -07:00
Victor Vieux
f369278725 Merge pull request #5569 from vieux/add__ping_to_the_API 
Add  ping to the api
 2014-05-05 10:09:31 -07:00
Michael Crosby
0b187b909b Address code review feedback 
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:08:59 -07:00
Michael Crosby
c1c6b3ccd9 Add docs for --net flag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:08:59 -07:00
Michael Crosby
5ca6532011 Update host networking with hostname and files 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:08:59 -07:00
Michael Crosby
a785882b29 Setup host networking for lxc and native 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:08:59 -07:00
Michael Crosby
2c2cc051d8 Update --net flags and container mode 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-05 10:08:59 -07:00
Johan Euphrosine
7118416aee runconfig/parse: add test for parseNetMode 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-05-05 10:08:59 -07:00
Johan Euphrosine
a60159f3b1 runconfig: add -net container:name option 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-05-05 10:08:59 -07:00
Tianon Gravi
d103f0186a Merge pull request #5562 from rhatdan/master 
Fix docker man page to reference selinux-enable flag
 2014-05-05 10:34:49 -06:00