0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6131 commits 14 branches 412 tags 338 MiB
Commit graph

6131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
3a7f69a3d8 Merge branch 'implement_create_veth' of https://github.com/creack/docker into add-netlink-functions 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-12 10:25:06 -08:00
Guillaume J. Charmes
38e5b4e70f
Simplify code + Allow more generic attr children + remove prefix 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-12 09:29:06 -08:00
Michael Crosby
e941111f33 Merge pull request #7 from creack/implement_create_veth 
Implement create veth
 2014-02-12 11:37:27 -05:00
Guillaume J. Charmes
dce7b6a69c
Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth 
Conflicts:
	pkg/netlink/netlink_linux.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-12 04:17:12 -08:00
Guillaume J. Charmes
2d2c237f50
Implement create veth 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-12 04:09:56 -08:00
Michael Crosby
34f5d94b2c Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-11 03:33:18 -08:00
Michael Crosby
2205707084 Merge pull request #5 from tianon/null-terminators-are-important 
Add comment clarifying null termination
 2014-02-11 12:33:07 -05:00
Tianon Gravi
c626349f65 Add comment clarifying null termination 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-11 10:32:31 -07:00
Michael Crosby
27ed9a9f98 Exec out to ip right now for creating the veth pair 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-11 03:32:35 -08:00
Michael Crosby
f9cd1be6ff Add more netlink functions for set ns by fd and bring iface down 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-10 22:32:07 -08:00
Michael Crosby
4dec36d1ee Allow add of empty name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-10 16:41:16 -08:00
Michael Crosby
38eabfa65c Create veth pair via netlink 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-10 13:37:16 -08:00
Michael Crosby
27df18ff11 Improve get if socket loop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-10 11:36:23 -08:00
Michael Crosby
ccf2b96fbc Merge pull request #4 from tianon/slight-netlink-cleanup 
Update NetworkChangeName to be more similar to my original
 2014-02-10 01:42:05 -05:00
Tianon Gravi
3a7c144e99 Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-09 18:14:17 -07:00
Michael Crosby
524416560a Replace my C code with tianons Go code 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-09 05:54:13 -08:00
Michael Crosby
ee39033073 Use c to change interface name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-08 20:44:04 -08:00
Michael Crosby
e3762e8d69 Add network set interface in namespace by pid 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-08 10:03:16 -08:00
Michael Crosby
a6c791e8a9 Add set master for interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-08 09:53:04 -08:00
Guillaume J. Charmes
105188be2e Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel 
remove mention of #docker-meeting
 2014-02-07 16:28:10 -08:00
Michael Crosby
36aafeb0b4 Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer 
pkg: systemd: add initial MAINTAINERS
 2014-02-07 12:32:21 -05:00
Andy Rothfusz
31a1a815c4 Merge pull request #3984 from jamtur01/secfaw 
Added Security FAQ question
 2014-02-06 17:40:59 -08:00
James Turnbull
55b74bfe46 Added Security FAQ security 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-02-07 01:42:11 +01:00
Guillaume J. Charmes
d0fc598ce2 Merge pull request #3948 from alexlarsson/devmapper-unmount 
Devmapper cleanup and unmount fix
 2014-02-06 15:10:06 -08:00
Alexander Larsson
693d3f8c6a devmapper: Fix MountDevice for non-existing Device 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-06 23:08:17 +01:00
Alexander Larsson
304e33a2fe devmapper: Fix UnmountDevice for non-existing device 
Properly error out if passed an id that doesn't exist.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-06 22:26:09 +01:00
Tianon Gravi
84285f7539 Merge pull request #3966 from asbjornenge/updated_tmlang 
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
 2014-02-06 14:20:52 -07:00
Tianon Gravi
1c6f909d32 Merge pull request #3977 from tianon/vim-onbuild 
Add "ONBUILD" highlighting to our vim syntax file
 2014-02-06 14:20:09 -07:00
Brandon Philips
15711ed670 pkg: systemd: add initial MAINTAINERS 
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-02-06 12:04:35 -08:00
Daniel Mizyrycki
c94ad37370 Merge pull request #3913 from mzdaniel/docker-ci-coverage 
docker-ci: Add new docker coverage report
 2014-02-06 20:04:21 +00:00
Daniel Mizyrycki
25d87553f6 docker-ci: Add new docker coverage report 
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
 2014-02-06 11:59:29 -08:00
Asbjørn Enge
f6c6f303f8 Added support for single quoted strings 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:50:36 +01:00
Asbjørn Enge
888e8da283 Improved regex 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:48:15 +01:00
Asbjørn Enge
3d86f07f87 Updated readme 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:38:25 +01:00
Asbjørn Enge
647db3938d Added suppport for the ONBUILD instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:38:20 +01:00
Asbjørn Enge
e95bb0b4a9 Removed the YAML file since I wasn't using it 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:37:49 +01:00
Asbjørn Enge
6561d65438 Added Dockerfile.tmPreferences for hotkey commenting 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-02-06 20:35:45 +01:00
Michael Crosby
22aeae34c1 Merge pull request #3974 from creack/3967-add_content_type-fix 
Add json content type to /containers/json api endpoint
 2014-02-06 14:18:00 -05:00
Michael Crosby
3ff62eb227 Merge pull request #3963 from unclejack/update-contributing 
Update issue filing & PR submission instructions
 2014-02-06 14:17:07 -05:00
Tianon Gravi
e634f23940 Add "ONBUILD" highlighting to our vim syntax file 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-06 11:12:57 -07:00
unclejack
1a12e9fbc6 Merge pull request #3972 from crosbymichael/fix-release-panic 
Check for nil information return
 2014-02-06 19:39:07 +02:00
Guillaume J. Charmes
d5d948a038
Add json content type to /containers/json api endpoint 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-06 09:28:30 -08:00
Guillaume J. Charmes
983edd40fa Merge pull request #3956 from crosbymichael/no-ping-from-client 
Do not ping registry from the cli
 2014-02-06 08:14:35 -08:00
Guillaume J. Charmes
2a1609d618 Merge pull request #3945 from crosbymichael/fix-brigeiface 
Fix bad rebase where bridgeiface was removed
 2014-02-06 07:38:32 -08:00
Alexander Larsson
2c82fd93d8 devmapper: Handle EBUSY while removing 
For some reason we seem to get transient EBUSY when removing
thinp devices, which prohibit removing containers. When
this happens we retry a few times which seems to fix the
issue for me.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-06 13:14:49 +01:00
Alexander Larsson
7e25cd5891 devmapper: Use removeDeviceAndWait in DeviceSet.removeDevice() 
This makes sure the device is removed just like in deactivateDevice.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-06 13:14:49 +01:00
Alexander Larsson
b95c560fdd devmapper: Move refcounting to DeviceSet 
We already have some kind of refcounting in DeviceSet, this fleshes
it out to allow it to completely subsume the refcounting in
devmapper.Driver.

This allows us to drop the double refcounting, and the locking inside
devmapper.Driver. This, in particular the locking simplification will
make it easier in the future to parallelize the device mapper.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-06 13:14:42 +01:00
Michael Crosby
bbe382bec4 Check for nil information return 
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-06 03:18:12 -08:00
unclejack
1f6000eaa0 update issue filing & PR submission instructions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-06 11:06:25 +02:00
unclejack
09702f4c31 Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api 
Fix broken images API for version <1.7
 2014-02-06 10:25:14 +02:00