e821f31734
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)
Upstream-commit: 6889cd9f9cfa3a6439b7702d73f27ab3fac3d3ef
Component: engine
2014-02-17 20:46:32 +01:00
ec112d1dff
Merge pull request #4187 from creack/fix_hostflag_panic
...
Fix DOCKER_HOST=tcp:// panic
Upstream-commit: 24498a896f5308c9f85e5ce92741330c85745398
Component: engine
2014-02-17 11:43:53 -08:00
217301fcd0
Merge pull request #4030 from TheDude05/fix-incorrect-ip-test
...
Fix IPv4 Subnet Test
Upstream-commit: 2769d66f78dfd94f8cbd4bf1ff50b5c7a039b647
Component: engine
2014-02-17 14:41:33 -05:00
3192f2a68b
Fix DOCKER_HOST=tcp:// panic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 513d86488046bfd898f5f1fdab39bfb302607535
Component: engine
2014-02-17 11:35:26 -08:00
02bb759ae6
Merge pull request #4186 from crosbymichael/netlink-maintainer
...
Make crosbymichael and creack netlink maintainers
Upstream-commit: 581ee7e584ae9946796f6c4e918873e8e94ce83a
Component: engine
2014-02-17 11:19:55 -08:00
d3c56b4c4a
Make crosbymichael and creack netlink maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a75c6907b48f730fe79c6c9ebfe22eeea6389f4a
Component: engine
2014-02-17 11:17:05 -08:00
c4d3310b03
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
Upstream-commit: f3ff19049138afebe4e28e30be2ee60364204f50
Component: engine
2014-02-17 21:12:28 +02:00
30a1fba1c5
Merge pull request #4167 from shykes/fix-tests-mac
...
Fix or document broken tests on mac
Upstream-commit: 19e44217f5a22f94395207f9389c257b433c7c7d
Component: engine
2014-02-17 11:01:17 -08:00
09b0499627
Merge pull request #4163 from mzdaniel/docker-ci
...
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
Upstream-commit: f056a5d8c552a3e7b7a272f01965bef8a5177390
Component: engine
2014-02-17 18:56:32 +00:00
226c83d1fa
Merge pull request #4185 from tmc/fix-building-with-space
...
Quote volume path in Makefile to allow spaces
Upstream-commit: 032f45683b95f0669297b5614494b31320c3da50
Component: engine
2014-02-17 11:53:41 -07:00
4573ff0486
Merge pull request #4172 from fabiofalci/test_save_and_load
...
Test for save and load commands
Upstream-commit: bc286d651da368e40d076650b2ccd45cb4820d71
Component: engine
2014-02-17 13:52:44 -05:00
d96c323380
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)
Upstream-commit: b7db2d5f8022e24faff80d312977c49a4c0408f3
Component: engine
2014-02-17 10:52:39 -08:00
4a474363c9
Merge pull request #4113 from SvenDowideit/build-quiet-help
...
add a little reenforcement to the help for docker build -q
Upstream-commit: 382659e03a59d68007fee1b54192233f7484c035
Component: engine
2014-02-17 10:38:43 -08:00
5bf062ee9c
Merge pull request #3463 from songgao/patch-2
...
Support submodules when building from a gh repo
Upstream-commit: a1fb3b5282248319fb2d1a14dadb2929538475c5
Component: engine
2014-02-17 10:28:17 -08:00
077c2ff0d6
Quote volume path to allow spaces
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 5006509131986093a9529a748e80e023e19548f3
Component: engine
2014-02-17 10:24:50 -08:00
dfed24534a
Merge pull request #4180 from alexlarsson/fix-restart-race
...
Avoid temporarily unmounting the container when restarting it
Upstream-commit: 1f66296c6e725d08be8560f7f2d6ce99413af170
Component: engine
2014-02-17 13:21:53 -05:00
e184f36805
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
Upstream-commit: c9ae66ffe375156ddf39cb41664224d6e1a6f096
Component: engine
2014-02-17 12:08:23 -06:00
7c00aec92f
Merge pull request #4164 from fabiofalci/cp_error_message
...
`docker cp` error when container doesn't exist
Upstream-commit: 59e88b09676691234bc9323a8aae1bf5c4ec4482
Component: engine
2014-02-17 19:13:55 +02:00
fc1f23f527
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b762d3a7391dd526826a0a1f1c983ea5e54852f5
Component: engine
2014-02-17 08:20:21 -07:00
601ee6a88d
Merge pull request #4061 from mikemaccana/patch-1
...
Add dockerode NodeJS implementation
Upstream-commit: ab4901552350db7c6ad9329b0f7b6aaa0ab87894
Component: engine
2014-02-17 10:14:17 -05:00
de5db25585
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)
Upstream-commit: ab0f3f86c8d05aa69415e6909a88b621d5b37e81
Component: engine
2014-02-17 16:10:54 +01:00
6180b3b390
Add dockerode NodeJS implementation
...
Also correctly case 'JavaScript'
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
Upstream-commit: 02d94dcf6ec2541c66b081d4dc251725f994747c
Component: engine
2014-02-17 14:04:47 +00:00
4dc8b80613
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)
Upstream-commit: 6a5a1d44f5d6c1281a66d562b7a4310dd6c3b997
Component: engine
2014-02-17 12:24:19 +10:00
e94461f78a
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)
Upstream-commit: 4ab3c31b155997821d5f75689617235fa7386efa
Component: engine
2014-02-17 01:52:50 +00:00
66f105510e
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)
Upstream-commit: 797b7d3446304be01c220c29f3dc6c4dcc2711be
Component: engine
2014-02-17 11:35:55 +10:00
ec297483f8
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)
Upstream-commit: 8871fd3a317240dbd6d5a9ae3309726281572bc1
Component: engine
2014-02-17 10:02:23 +10:00
1bea948b6b
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)
Upstream-commit: a51441278afbfde76ac1ec1e01c619fe5733b895
Component: engine
2014-02-16 15:49:36 +00:00
9fdd3cd967
Change name to listenbuffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d5e41c1cb67b7ccb86fbbd80079642afd5055c2a
Component: engine
2014-02-15 21:10:37 -08:00
9fff3868b1
Integration generic socket wait for docker api
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 778f1bf6639e52004608ca2289e04b8f7bddb14b
Component: engine
2014-02-15 20:49:50 -08:00
09d6a6c5dd
Use socket activation pkg for listeners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 64716a21e464ac63dd9b287c832ae3431e1418d0
Component: engine
2014-02-15 20:24:55 -08:00
7473a46910
Add socket activation for go apps
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cfb7711a74dc4b54d879f79bc2f6435ed71163b9
Component: engine
2014-02-15 20:18:47 -08:00
31f7e336a5
Merge pull request #4107 from shykes/separate-api-client
...
Move remote API client out of the core and into api/
Upstream-commit: 72ed2537b31daf2cf3dbfa005da39dff531b1eb5
Component: engine
2014-02-15 18:56:49 -05:00
1abcb90948
Merge pull request #4102 from shykes/separate-mkbuildclient
...
Refactor utility `MkBuildContext` to the more generic `archive.Generate`
Upstream-commit: 4bc966f30284790a6d9372e3c606923e89d3e24c
Component: engine
2014-02-15 18:27:13 -05:00
9c1c314fd9
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)
Upstream-commit: 44e10433c7a3811d4d0897192418cb6b62996584
Component: engine
2014-02-15 23:24:51 +00:00
377e102312
Remove duplicate function displayablePorts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 567a422a65f71a58c3000aa66a42853c7e005bb4
Component: engine
2014-02-15 14:55:57 -08:00
024e6f564e
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)
Upstream-commit: ee59ba969fdd1837fe0151638cc01637e18139c3
Component: engine
2014-02-15 14:55:51 -08:00
0f43c3eb05
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)
Upstream-commit: 9b56da78e0b1e4e1da9b2bacc44a22143745a2b0
Component: engine
2014-02-15 14:52:08 -08:00
0efb658af5
Document Darwin test failure in a FIXME
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 7286842a12e3620224e4de65730a3b40d17f1f3a
Component: engine
2014-02-15 14:40:07 -08:00
d029fb179f
Fix engine tests on systems where temp directories are symlinked.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 353cc8c2a5d9ae4c02dc94e14cd2ad6d3393992d
Component: engine
2014-02-15 14:39:51 -08:00
a10cdc2a0c
Move links to sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 147b09fae9527e760d74b5ef2f9558ee109f4009
Component: engine
2014-02-14 18:18:16 -08:00
8a2b18fccd
Remove container dependency for links
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fc952e0de94aa4283c677ce6c153b1a766db2fc0
Component: engine
2014-02-14 18:07:33 -08:00
f49bfc486b
Merge pull request #4160 from crosbymichael/cleanup-exec-drivers
...
Cleanup some statements from exec driver work
Upstream-commit: a7ecc3ea119857593186025ce7268db4c0cbb18c
Component: engine
2014-02-14 17:32:01 -08:00
a7d9996138
Cleanup some statements from exec driver work
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9e3da87a3a6fea21194ceb9dbd30a39d043a48a4
Component: engine
2014-02-14 17:28:50 -08:00
39bda86fa5
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)
Upstream-commit: bd54d40f68f78093d6a252e96f8d17f7021af7b5
Component: engine
2014-02-14 17:15:40 -08:00
690b93143a
Move proxy into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8c39db8f96ac2a7ec479a679bc060410cee1a567
Component: engine
2014-02-14 15:48:05 -08:00
48bceec5a6
Remove unused reflink files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 055bfb699bb232c7e490c38d3a71c81870781c74
Component: engine
2014-02-14 15:32:39 -08:00
59b0ef3a94
Merge pull request #4152 from crosbymichael/update-fixme
...
Update fixme
Upstream-commit: 072268ae5696be77afa93836b45de4b78b16bd63
Component: engine
2014-02-14 15:19:16 -08:00
afbbdb7fc1
Update fixme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 106079daca36e8c5595c3f05eb183c9919016e4e
Component: engine
2014-02-14 15:17:12 -08:00
0844a7fe89
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: 1140411d4c0fd27a401944a8f57f8c8cdb9baf94
Component: engine
2014-02-14 12:13:09 -08:00
07f1d747db
Add new functions to unsupported file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 17719cab91e175a7bd11f9852e27638df1202b8b
Component: engine
2014-02-14 12:12:35 -08:00
