Victor Vieux
b7c2e8f54e
Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco
...
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
2014-02-17 12:28:05 -08:00
Victor Vieux
8f140b2ded
Merge pull request #4178 from alexlarsson/fix-aufs-plnk
...
archive: Handle aufs plink hardlinks in ApplyLayer
2014-02-17 11:48:39 -08:00
Alexander Larsson
6889cd9f9c
archive: Handle aufs plink hardlinks in ApplyLayer
...
Files in the .wh..wh.plnk directory are ignored, but other files
inside the tarfile can be hardlinks to these files. This is not
something that normally happens, as on aufs unmount such files are
supposed to be dropped via the "auplink" too, yet images on the index
(such as shipyard/shipyard, e.g. layer
f73c835af6d58b6fc827b400569f79a8f28e54f5bb732be063e1aacefbc374d0)
contains such files.
We handle these by extracting these files to a temporary directory
and resolve such hardlinks via the temporary files.
This fixes https://github.com/dotcloud/docker/issues/3884
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 20:46:32 +01:00
Victor Vieux
24498a896f
Merge pull request #4187 from creack/fix_hostflag_panic
...
Fix DOCKER_HOST=tcp:// panic
2014-02-17 11:43:53 -08:00
Michael Crosby
2769d66f78
Merge pull request #4030 from TheDude05/fix-incorrect-ip-test
...
Fix IPv4 Subnet Test
2014-02-17 14:41:33 -05:00
Guillaume J. Charmes
513d864880
Fix DOCKER_HOST=tcp:// panic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-17 11:35:26 -08:00
Guillaume J. Charmes
581ee7e584
Merge pull request #4186 from crosbymichael/netlink-maintainer
...
Make crosbymichael and creack netlink maintainers
2014-02-17 11:19:55 -08:00
Michael Crosby
a75c6907b4
Make crosbymichael and creack netlink maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 11:17:05 -08:00
unclejack
f3ff190491
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
2014-02-17 21:12:28 +02:00
Guillaume J. Charmes
19e44217f5
Merge pull request #4167 from shykes/fix-tests-mac
...
Fix or document broken tests on mac
2014-02-17 11:01:17 -08:00
Daniel Mizyrycki
f056a5d8c5
Merge pull request #4163 from mzdaniel/docker-ci
...
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
2014-02-17 18:56:32 +00:00
Tianon Gravi
032f45683b
Merge pull request #4185 from tmc/fix-building-with-space
...
Quote volume path in Makefile to allow spaces
2014-02-17 11:53:41 -07:00
Michael Crosby
bc286d651d
Merge pull request #4172 from fabiofalci/test_save_and_load
...
Test for save and load commands
2014-02-17 13:52:44 -05:00
Daniel Mizyrycki
b7db2d5f80
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
2014-02-17 10:52:39 -08:00
Victor Vieux
382659e03a
Merge pull request #4113 from SvenDowideit/build-quiet-help
...
add a little reenforcement to the help for docker build -q
2014-02-17 10:38:43 -08:00
Guillaume J. Charmes
a1fb3b5282
Merge pull request #3463 from songgao/patch-2
...
Support submodules when building from a gh repo
2014-02-17 10:28:17 -08:00
Travis Cline
5006509131
Quote volume path to allow spaces
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-02-17 10:24:50 -08:00
Michael Crosby
1f66296c6e
Merge pull request #4180 from alexlarsson/fix-restart-race
...
Avoid temporarily unmounting the container when restarting it
2014-02-17 13:21:53 -05:00
Song Gao
c9ae66ffe3
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
2014-02-17 12:08:23 -06:00
unclejack
59e88b0967
Merge pull request #4164 from fabiofalci/cp_error_message
...
`docker cp` error when container doesn't exist
2014-02-17 19:13:55 +02:00
Tianon Gravi
b762d3a739
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-17 08:20:21 -07:00
James Turnbull
ab49015523
Merge pull request #4061 from mikemaccana/patch-1
...
Add dockerode NodeJS implementation
2014-02-17 10:14:17 -05:00
Alexander Larsson
ab0f3f86c8
Avoid temporarily unmounting the container when restarting it
...
Stopping the container will typicall cause it to unmount, to keep it mounted
over the stop/start cycle we aquire a temporary reference to it during this time.
This helps with https://github.com/dotcloud/docker/issues/4036
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 16:10:54 +01:00
Mike MacCana
02d94dcf6e
Add dockerode NodeJS implementation
...
Also correctly case 'JavaScript'
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
2014-02-17 14:04:47 +00:00
Sven Dowideit
6a5a1d44f5
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 12:24:19 +10:00
Fabio Falci
4ab3c31b15
Test for save and load commands
...
Improve test for save to tar and load from tar commands.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-17 01:52:50 +00:00
Sven Dowideit
797b7d3446
add a little reenforcement to the help for docker build -q
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 11:35:55 +10:00
Sven Dowideit
8871fd3a31
change the -H TCP / docker group warning to not reference a resolved issue
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 10:02:23 +10:00
Fabio Falci
a51441278a
docker cp error when container doesn't exist
...
Fix cp api to return a 404 notfound if container doesn't exist.
Fixes #4119 .
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-16 15:49:36 +00:00
Michael Crosby
d5e41c1cb6
Change name to listenbuffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 21:10:37 -08:00
Michael Crosby
778f1bf663
Integration generic socket wait for docker api
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:49:50 -08:00
Michael Crosby
64716a21e4
Use socket activation pkg for listeners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:24:55 -08:00
Michael Crosby
cfb7711a74
Add socket activation for go apps
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:18:47 -08:00
Michael Crosby
72ed2537b3
Merge pull request #4107 from shykes/separate-api-client
...
Move remote API client out of the core and into api/
2014-02-15 18:56:49 -05:00
Michael Crosby
4bc966f302
Merge pull request #4102 from shykes/separate-mkbuildclient
...
Refactor utility `MkBuildContext` to the more generic `archive.Generate`
2014-02-15 18:27:13 -05:00
Solomon Hykes
44e10433c7
api/container.go: an API-specific representation of a container
...
This breaks the dependency from the remote API implementation to the
internal representation of a container. Instead it uses its own partial
representation of a container, with only required fields.
* This preserves reverse-compatibility with all past implementations of the remote API.
* This clarifies which fields are guaranteed to be present in a response
A docker remote api server *may* return more fields in a Container
object, but their presence and semantics are not guaranteed and should
not be relied upon by client implementations.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 23:24:51 +00:00
Solomon Hykes
567a422a65
Remove duplicate function displayablePorts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:57 -08:00
Solomon Hykes
ee59ba969f
Move remote api client to api/
...
This moves `commands.go` out of the core and into `api/client.go`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:51 -08:00
Solomon Hykes
9b56da78e0
Refactor utility MkBuildContext to the more generic archive.Generate
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:52:08 -08:00
Solomon Hykes
7286842a12
Document Darwin test failure in a FIXME
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:40:07 -08:00
Solomon Hykes
353cc8c2a5
Fix engine tests on systems where temp directories are symlinked.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:39:51 -08:00
Michael Crosby
147b09fae9
Move links to sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:18:16 -08:00
Michael Crosby
fc952e0de9
Remove container dependency for links
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:07:33 -08:00
Victor Vieux
a7ecc3ea11
Merge pull request #4160 from crosbymichael/cleanup-exec-drivers
...
Cleanup some statements from exec driver work
2014-02-14 17:32:01 -08:00
Michael Crosby
9e3da87a3a
Cleanup some statements from exec driver work
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:28:50 -08:00
Michael Crosby
bd54d40f68
Move volumes out of container.go and into volumes.go
...
This helps clean up the container file and move volumes into
one location. We currently cannot move volumes to a sub pkg
because they depend on Container and also modify fields on the
container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:15:40 -08:00
Michael Crosby
8c39db8f96
Move proxy into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:48:05 -08:00
Michael Crosby
055bfb699b
Remove unused reflink files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:32:39 -08:00
Victor Vieux
072268ae56
Merge pull request #4152 from crosbymichael/update-fixme
...
Update fixme
2014-02-14 15:19:16 -08:00
Michael Crosby
106079daca
Update fixme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:17:12 -08:00