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
0736eb6d16
Merge pull request #5609 from crosbymichael/move-env-gen
2014-05-05 15:52:47 -07:00
ab58dd5a44
Merge pull request #5611 from vieux/networkfs_pkgs
...
add 2 networkfs pkgs
2014-05-05 15:52:14 -07:00
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
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
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
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
222605b5fb
Merge pull request #5608 from crosbymichael/net-flag-refactor
...
HOTFIX Update after namespace refactor
2014-05-05 13:58:09 -07:00
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
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
2165a4993b
Merge pull request #5602 from crosbymichael/libcontainer-enable
...
Improve libcontainer namespace and cap format
2014-05-05 13:50:08 -07:00
51933bd5e1
Merge pull request #5575 from vieux/pr-5428
2014-05-05 13:48:36 -07:00
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
07db13509b
Merge pull request #5596 from dotcloud/contrib-fix
...
Post-commit hook URL fix
2014-05-05 13:44:48 -07:00
99be235332
Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
2014-05-05 13:41:43 -07:00
13c1865541
Merge pull request #5604 from nirvdrum/patch-1
...
It's its.
2014-05-05 21:49:47 +02:00
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
b25208ee3e
It's its.
2014-05-05 15:43:11 -04:00
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
34e09afa24
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
2014-05-05 11:16:57 -07:00
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
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
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
e3d6898da1
Merge pull request #5591 from alexlarsson/fix-expose-parsing
...
nat: Fix --expose protocol parsing
2014-05-05 10:32:26 -07:00
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
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
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
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
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
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
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
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
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
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
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
c34bb099e5
Fixed the horrible OSX installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-05 17:02:03 +02:00
30d458c534
Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
...
Several OSX install reader issues fixed
2014-05-05 16:46:03 +02:00
10766e1fb4
Post-commit hook URL fix
...
Updating CONTRIBUTING to include the correct URL for the post-commit hook.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
2014-05-05 10:28:52 -04:00
56d71ae79b
Several reader issues fixed
...
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-05 22:52:12 +10:00
e625bad3d7
Fix docker man page to reference selinux-enable flag
...
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-05 08:41:21 -04:00
e9fd8e285e
Merge pull request #5587 from SvenDowideit/docs-examples-style-guide
...
Rearrange the existing info a little, and add example style guide
2014-05-05 13:36:47 +01:00
46755dfc1a
Rearrange the existing info a little, and add example style guide
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-05 22:18:12 +10:00
a304dcef00
nat: Fix --expose protocol parsing
...
A command like:
docker run --expose 5353/tcp -P fedora sleep 10
Currently fails with:
Error: Cannot start container 5c558de5f0bd85ff14e13e3691aefbe531346297a27d4b3562732baa8785b34a: unknown protocol
This is because nat.SplitProtoPort() confuses the order of the port and
proto in 5353/tcp, assuming the protocol is first. However, in all other
places in docker the protocol is last, so the fix is just to swap these.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-05 12:54:10 +02:00
3230889d24
Merge pull request #5585 from lukemarsden/patch-1
...
git clone should use https URL in devenvironment.md
2014-05-05 08:48:13 +10:00
6799d14cb8
Update devenvironment.md
...
`git clone` should use `https` URL.
2014-05-04 17:52:48 +01:00
9488832c6d
Merge pull request #5579 from jamtur01/linkdashs
...
Fixed a couple of single dashes in links document
2014-05-04 13:28:46 +01:00
dcae8c157b
Introduce x-axe scrolling to code-blocks.
...
This improvement introduces x-axe scrolling to code-blocks by
overriding certain default bootstrap word-wrapping constraints.
This PR closes: https://github.com/dotcloud/docker/issues/5279
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-05-04 13:25:03 +01:00
8d7ed2cae4
Update vendored deps that have a proper version number to use said specific versions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-03 20:34:21 -06:00
bfac0b24ed
Fixed a couple of single dashes in links document
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-04 03:16:21 +02:00
54e20b8f7b
Merge pull request #5578 from msulima/patch-1
...
hello_world.md - $container_id variable case sensitivity
2014-05-03 12:53:14 +01:00
Sven Dowideit
Victor Vieux
Michael Crosby
Victor Vieux
Michael Crosby
Guillaume J. Charmes
James Turnbull
Tianon Gravi
Kevin Menard
Rohit Jnagal
Alexander Larsson
unclejack
Johan Euphrosine
Aaron Huslage
Dan Walsh
O.S. Tezer
lukemarsden
O.S.Tezer