dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-02 22:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,395 Commits 19 Branches 591 Tags
2fec15cff181775ffc86bd3def69ed41de917367
Commit Graph

8395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turnbull
2fec15cff1 Merge pull request #5982 from jamtur01/bitbucket 
Added BitBucket support to documentation
 2014-05-22 11:35:17 +10:00
James Turnbull
cd44cd26cb Merge pull request #5959 from tpng/patch-1 
Add instructions for persisting data
 2014-05-22 09:55:05 +10:00
Sven Dowideit
a0260c1181 Merge pull request #5897 from jamtur01/newintro 
Rewrite of the Introduction documentation
 2014-05-21 16:53:03 -07:00
Michael Crosby
4bb4bf634a Merge pull request #5859 from philips/append-etc-hosts-not-bind 
fix(daemon): prepend host /etc/hosts instead of bind mounting
 2014-05-21 15:57:59 -07:00
Victor Vieux
fe1d297b9d Merge pull request #5895 from tianon/update-authors 
Update AUTHORS and .mailmap
 2014-05-21 22:57:05 +00:00
Victor Vieux
cedd76cb52 Merge pull request #5981 from philips/bump-go-systemd 
vendor: bump github.com/coreos/go-systemd to v2
 2014-05-21 15:52:35 -07:00
James Turnbull
62468a3eba Added BitBucket support to documentation 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-05-22 08:35:10 +10:00
Brandon Philips
df5585b273 vendor: bump github.com/coreos/go-systemd to v2 
There are a couple of bugfixes since this was last bumped. Pull them in.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-05-21 15:31:04 -07:00
Brandon Philips
61ac745d7a integration-cli: fix spelling error in test 
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-05-21 15:20:29 -07:00
Brandon Philips
5579bec47b integration-cli: tests for /etc/hosts and net=host 
Some basic tests to make sure this is acting correctly on machines.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-05-21 15:20:29 -07:00
Michael Crosby
718e522c71 Merge pull request #5979 from rhatdan/terminal 
This check was backwards.
 2014-05-21 14:51:13 -07:00
Dan Walsh
26b4a4920a This check was backwards. 
If I do a

docker events  > /tmp/out

I do not want the control characters getting written to the file.
The check should check the output file not the input file.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-05-21 17:37:40 -04:00
James Turnbull
0056884090 Rewrite of the Introduction documentation 
1. Re-aligns the introduction with the new product positioning.
2. Cleanup of some issues with language and formatting.
3. Makes the introduction leaner and meaner.
4. Responds to feedback from product.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-05-22 07:11:43 +10:00
Victor Vieux
b7f9e683c3 Merge pull request #5958 from erikh/5738-docker_port_in_use 
docker port in use
 2014-05-21 21:06:27 +00:00
Victor Vieux
457cb86cf2 Merge pull request #5975 from tianon/revert-run-tmpfs 
Revert "Always mount a /run tmpfs in the container"
 2014-05-21 13:46:48 -07:00
Tianon Gravi
8e967fe802 Revert "Always mount a /run tmpfs in the container" 
This reverts commit 905795ece6.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-21 14:28:19 -06:00
Michael Crosby
2ff4f71528 Merge pull request #5953 from tiborvass/remove-chmod-755 
remove chmod 755: fixes #5941
 2014-05-21 12:27:06 -07:00
Tibor Vass
bb431a7190 for perms checking tests, create files from Go and remove them from git 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-05-21 11:35:12 -07:00
Tibor Vass
56a53c72d2 remove chmod 755: fixes #5941 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-05-21 11:35:08 -07:00
James Turnbull
29a192ca4d Merge pull request #5965 from cpuguy83/5963-fix-single-dash-in-working-with-volumes 
Fixes some docs issues with using single-dash arguments where they should be double
 2014-05-22 03:31:46 +10:00
Victor Vieux
286a17ff19 Merge pull request #5955 from anandkumarpatel/5923-fix-leaking-go-routine 
5923-fix-leaking-go-routine
 2014-05-21 10:11:56 -07:00
Erik Hollensbe
91ba337931 bridge: retry any proxy set up failures until we get a successful port, defeats a race condition 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-05-21 09:14:53 -07:00
Erik Hollensbe
f0489ce3a9 portallocator: rewrite to simplify, removes race condition 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-05-21 09:14:53 -07:00
Brian Goff
6d9e64b27b Fixes some docs issues with using single-dash arguments where they should be double 
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-05-21 09:35:22 -04:00
unclejack
a94a87778c Merge pull request #5954 from vieux/fix_cp_error 
Ignore lchown error on docker cp
 2014-05-21 15:55:57 +03:00
tpng
accea18920 Add instructions for persisting data 
Docker-DCO-1.1-Signed-off-by: Benny Ng <benny.tpng@gmail.com> (github: tpng)
 2014-05-21 16:45:41 +08:00
James Turnbull
f37339c2db Merge pull request #5765 from jamtur01/contribf 
Added to small patch exemption to cover Markdown/syntax errors
 2014-05-21 17:13:03 +10:00
AnandkumarPatel
789a8f2616 use buffered channel so goroutine does not get blocked on done <- true when a timeout occurs. 
Docker-DCO-1.1-Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com> (github: anandkumarpatel)
 2014-05-20 21:33:40 -07:00
Victor Vieux
9e51b7abae ignore lchown error on docker cp 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-21 00:23:17 +00:00
Victor Vieux
5eef0a28cb add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-21 00:10:07 +00:00
Michael Crosby
83e9dc7200 Merge pull request #5755 from vieux/move_inspect_daemon 
move inspect from server to daemon
 2014-05-20 15:50:38 -07:00
Tianon Gravi
1f219672fa Merge pull request #5950 from tianon/update-deps 
Update gorilla/mux, gorilla/context, and kr/pty deps
 2014-05-20 16:16:21 -06:00
Michael Crosby
1310243d48 Merge pull request #5946 from crosbymichael/lxc-host-net 
Fix network mode for lxc 1.0
 2014-05-20 14:51:33 -07:00
Victor Vieux
240fad4974 Merge pull request #5951 from vieux/pr5919 
Fix remote add cache
 2014-05-20 14:33:05 -07:00
Victor Vieux
03a109e446 add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-20 21:31:28 +00:00
Guillaume J. Charmes
bcfe2ceffb Remove the mtime for temp file. Prevent false negative cache 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-05-20 21:31:28 +00:00
Brice Jaglin
9810da853b force the read of the tarSum so that sums actually get computed 
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv> (github: bjaglin)
 2014-05-20 21:31:28 +00:00
Michael Crosby
70d35b9d39 Merge pull request #5918 from crosbymichael/volumes-commit 
Do not commit host bind mounts into image
 2014-05-20 14:28:49 -07:00
Tianon Gravi
d98af1236c Update gorilla/mux, gorilla/context, and kr/pty deps 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-20 15:23:50 -06:00
Michael Crosby
e2d79bec3a Update runconfig unit test for changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-20 21:11:33 +00:00
Tianon Gravi
a16cb394fa Merge pull request #5945 from crosbymichael/lxc-version-bump 
Update LXC requirement to 1.0
 2014-05-20 14:54:24 -06:00
Michael Crosby
94f01184be Update lxc requirement to 1.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-20 20:45:22 +00:00
Michael Crosby
f915988a5d Merge pull request #5916 from rhatdan/crash 
docker '' causes a golang crash.
 2014-05-20 13:42:48 -07:00
Victor Vieux
603e00a3a7 move inspect from server to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-20 19:36:15 +00:00
Michael Crosby
0f27894094 Fix network mode for lxc 1.0 
Fixes #5692

This change requires lxc 1.0+ to work and breaks lxc versions less than
1.0 for host networking.  We think that this is a find tradeoff by
bumping docker to only support lxc 1.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-20 19:10:23 +00:00
Dan Walsh
bc081a03d8 docker '' causes a golang crash. 
This patch fixes the problem.

Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-05-20 14:04:27 -04:00
Michael Crosby
e5202de918 Merge pull request #5930 from alexlarsson/add-cap-setfcap 
native driver: Don't drop SETFCAP
 2014-05-20 10:29:37 -07:00
Michael Crosby
f3edb7c0e8 Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod 
cgroups: Allow mknod for any device in systemd cgroup backend
 2014-05-20 10:13:13 -07:00
Tianon Gravi
47aa9f5a0e Merge pull request #5844 from stpierre/init-script-wait-for-pidfile 
Wait for pidfile to exist when starting with RedHat init script
 2014-05-20 10:25:03 -06:00
Alexander Larsson
fcf2e9a910 native driver: Add required capabilities 
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928

We also need SETPCAP, for instance systemd needs this to set caps
on its childen.

Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.

We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-05-20 11:31:39 +02:00