34423b310d
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)
Upstream-commit: 3a7f69a3d87e2d35d1416e0ea4fe7e1e1a85f8f8
Component: engine
2014-02-12 10:25:06 -08:00
68a1243dca
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)
Upstream-commit: 38e5b4e70fb6b93aa2b86e4d625a0032b97b991a
Component: engine
2014-02-12 09:29:06 -08:00
e9d3b3a45f
Merge pull request #7 from creack/implement_create_veth
...
Implement create veth
Upstream-commit: e941111f33441964830f8f31a648f25f9eb12cf8
Component: engine
2014-02-12 11:37:27 -05:00
1f519be2f8
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)
Upstream-commit: dce7b6a69c42fb64a99f873a5f7568799228c1e5
Component: engine
2014-02-12 04:17:12 -08:00
bcb95a4894
Implement create veth
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 2d2c237f50b7954993f6cd1db67c6f8c6d06f881
Component: engine
2014-02-12 04:09:56 -08:00
ad55909560
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)
Upstream-commit: 34f5d94b2cfb0a5401b31f3b669ae6579d8126a8
Component: engine
2014-02-11 03:33:18 -08:00
40c8407540
Merge pull request #5 from tianon/null-terminators-are-important
...
Add comment clarifying null termination
Upstream-commit: 2205707084c7cc5d2422a0b03e97cbf8632039d5
Component: engine
2014-02-11 12:33:07 -05:00
3f55cc6f41
Add comment clarifying null termination
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c626349f651a660302f64101055d65dc6e990307
Component: engine
2014-02-11 10:32:31 -07:00
6d92748c6f
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)
Upstream-commit: 27ed9a9f98750ab666d6221553b6f4ea59d396b8
Component: engine
2014-02-11 03:32:35 -08:00
c0caaa92a3
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)
Upstream-commit: f9cd1be6ffbda85f20cc7926274fab7484a19823
Component: engine
2014-02-10 22:32:07 -08:00
1093e871da
Allow add of empty name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4dec36d1ee8cfd8b396210daa5367d146bbb34bc
Component: engine
2014-02-10 16:41:16 -08:00
6da2235591
Create veth pair via netlink
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 38eabfa65c5be78a08a8287b600e230dbe0bfac5
Component: engine
2014-02-10 13:37:16 -08:00
5fb9dcf843
Improve get if socket loop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 27df18ff11dbfc22ca539462710abf07d507c0d9
Component: engine
2014-02-10 11:36:23 -08:00
33cd5e68ce
Merge pull request #4 from tianon/slight-netlink-cleanup
...
Update NetworkChangeName to be more similar to my original
Upstream-commit: ccf2b96fbc1b19749bee730db5623b9bc882c147
Component: engine
2014-02-10 01:42:05 -05:00
aaca90f4b6
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)
Upstream-commit: 3a7c144e9992591f32daf2d4f1b35b7b6520a07e
Component: engine
2014-02-09 18:14:17 -07:00
c36542fc7c
Replace my C code with tianons Go code
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 524416560a4624d30023db32101c9fe5ebffc895
Component: engine
2014-02-09 05:54:13 -08:00
347c7fca0d
Use c to change interface name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ee39033073ece35e91c6c5a8cb66d23246511fb0
Component: engine
2014-02-08 20:44:04 -08:00
e66ed158d6
Add network set interface in namespace by pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e3762e8d6937741a5654b1443f95beb784f018f1
Component: engine
2014-02-08 10:03:16 -08:00
7920ed3ee7
Add set master for interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a6c791e8a92f29a2ae2c6bc81e4ab873d3ceb41f
Component: engine
2014-02-08 09:53:04 -08:00
1d05c3f324
Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel
...
remove mention of #docker-meeting
Upstream-commit: 105188be2e321bb462edccfdddbeda2a12a74bc9
Component: engine
2014-02-07 16:28:10 -08:00
a58e2667ed
Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer
...
pkg: systemd: add initial MAINTAINERS
Upstream-commit: 36aafeb0b49b096df6967b7681a7676b36abbc3b
Component: engine
2014-02-07 12:32:21 -05:00
25d86837fc
Merge pull request #3984 from jamtur01/secfaw
...
Added Security FAQ question
Upstream-commit: 31a1a815c4f3a9a651c3c87bebaead252c147874
Component: engine
2014-02-06 17:40:59 -08:00
f006ee4708
Added Security FAQ security
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 55b74bfe469115f25a52c6ad48b13eb9c7e6197c
Component: engine
2014-02-07 01:42:11 +01:00
e7b56195a8
Merge pull request #3948 from alexlarsson/devmapper-unmount
...
Devmapper cleanup and unmount fix
Upstream-commit: d0fc598ce2d4d4d4d2cc6b530ffaf74978d6d0d9
Component: engine
2014-02-06 15:10:06 -08:00
3959ecf0a9
devmapper: Fix MountDevice for non-existing Device
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 693d3f8c6ab4c9fed5fe4c5ac5fcb44568fe1638
Component: engine
2014-02-06 23:08:17 +01:00
4c4ba56ea4
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)
Upstream-commit: 304e33a2fe2d006cc1063c8060c6e22c9ade3d59
Component: engine
2014-02-06 22:26:09 +01:00
e004860fa8
Merge pull request #3966 from asbjornenge/updated_tmlang
...
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
Upstream-commit: 84285f7539f5825db62df3e3995d3de7b96b0a89
Component: engine
2014-02-06 14:20:52 -07:00
bd43778b40
Merge pull request #3977 from tianon/vim-onbuild
...
Add "ONBUILD" highlighting to our vim syntax file
Upstream-commit: 1c6f909d329c913c5f10173feeb8b618f2c2be19
Component: engine
2014-02-06 14:20:09 -07:00
bd67bce023
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)
Upstream-commit: 15711ed670e8ab59611030ea1191189ad495ea63
Component: engine
2014-02-06 12:04:35 -08:00
0e6d13a72d
Merge pull request #3913 from mzdaniel/docker-ci-coverage
...
docker-ci: Add new docker coverage report
Upstream-commit: c94ad3737044f27410ea0de85551ffeee88d4cc8
Component: engine
2014-02-06 20:04:21 +00:00
20c26b1bdf
docker-ci: Add new docker coverage report
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
Upstream-commit: 25d87553f678e247b3036db7804599624191dfd1
Component: engine
2014-02-06 11:59:29 -08:00
b27e52cf64
Added support for single quoted strings
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: f6c6f303f84773987afd5f83d9c1e2170fa140e3
Component: engine
2014-02-06 20:50:36 +01:00
f652ab5b5e
Improved regex
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 888e8da2832871b10f60ba9d3058fc442812ca17
Component: engine
2014-02-06 20:48:15 +01:00
169c246340
Updated readme
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 3d86f07f8776fd97f1f75e99ad535a9b6543059a
Component: engine
2014-02-06 20:38:25 +01:00
94f2865699
Added suppport for the ONBUILD instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 647db3938d27d832d09f622b304c7bd23bc00d74
Component: engine
2014-02-06 20:38:20 +01:00
a0b0e2b023
Removed the YAML file since I wasn't using it
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: e95bb0b4a9ef642d02f5549ba8375f9952eff0b3
Component: engine
2014-02-06 20:37:49 +01:00
8a1a839738
Added Dockerfile.tmPreferences for hotkey commenting
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 6561d65438ed2e10143a5a8bac32bf62d5d8950d
Component: engine
2014-02-06 20:35:45 +01:00
1f0d29026d
Merge pull request #3974 from creack/3967-add_content_type-fix
...
Add json content type to /containers/json api endpoint
Upstream-commit: 22aeae34c1d257956e6201697e30dd64028a1182
Component: engine
2014-02-06 14:18:00 -05:00
3d83357a3e
Merge pull request #3963 from unclejack/update-contributing
...
Update issue filing & PR submission instructions
Upstream-commit: 3ff62eb2271615534db1f5a9e197727fa7b8b1bb
Component: engine
2014-02-06 14:17:07 -05:00
fc2d4abd37
Add "ONBUILD" highlighting to our vim syntax file
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e634f2394085d5dc7e716553b330acb8694bf6d3
Component: engine
2014-02-06 11:12:57 -07:00
1a36cfd179
Merge pull request #3972 from crosbymichael/fix-release-panic
...
Check for nil information return
Upstream-commit: 1a12e9fbc665833a96a3b98bef2cf33d2cda4642
Component: engine
2014-02-06 19:39:07 +02:00
3287c05092
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)
Upstream-commit: d5d948a038933251fe39021883b71f3399ab116c
Component: engine
2014-02-06 09:28:30 -08:00
2709486982
Merge pull request #3956 from crosbymichael/no-ping-from-client
...
Do not ping registry from the cli
Upstream-commit: 983edd40fa118a8fe79b83b8ec7238c16949c33e
Component: engine
2014-02-06 08:14:35 -08:00
297c54c134
Merge pull request #3945 from crosbymichael/fix-brigeiface
...
Fix bad rebase where bridgeiface was removed
Upstream-commit: 2a1609d618fc89cd76affe163db4b8dab153ec40
Component: engine
2014-02-06 07:38:32 -08:00
8a70fd74d7
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)
Upstream-commit: 2c82fd93d8a01cc1f53fe861378e6d2dca0486c6
Component: engine
2014-02-06 13:14:49 +01:00
931e825d56
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)
Upstream-commit: 7e25cd5891f84c2fab656c364002290e4b87f934
Component: engine
2014-02-06 13:14:49 +01:00
d2595404a2
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)
Upstream-commit: b95c560fdda4813319a2377e240592a3261e30ef
Component: engine
2014-02-06 13:14:42 +01:00
79a6ce6a54
Check for nil information return
...
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bbe382bec4b24d8aee09570f2c3920cc1c9710ca
Component: engine
2014-02-06 03:18:12 -08:00
71b42cf15f
update issue filing & PR submission instructions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 1f6000eaa0d571d34e2c9207692fb82c4a022061
Component: engine
2014-02-06 11:06:25 +02:00
4180ce4fa5
Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api
...
Fix broken images API for version <1.7
Upstream-commit: 09702f4c31e2b3899192318659ff59512cb28d8d
Component: engine
2014-02-06 10:25:14 +02:00
