ae895eae45
Merge pull request #4207 from crosbymichael/bump_v0.8.1
...
Bump to version 0.8.1
Upstream-commit: 2845c798d6398977313693d593711ba6f3c6d057
Component: engine
2014-02-18 19:22:30 -05:00
f51c1fe9ad
Bump to version 0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a1598d1e1c157388f3b07415729de28f4d205e49
Component: engine
2014-02-18 12:36:05 -08:00
83fda6f327
Merge branch 'master' into bump_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 049c7effe961f70c9489dac5250dd037cf95e7d6
Component: engine
2014-02-18 10:51:19 -08:00
883b90f698
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
Upstream-commit: 277262d9c7ff802092f8cef7172462e4ddd4da02
Component: engine
2014-02-18 11:50:16 -07:00
25d282a4de
Merge pull request #4206 from tianon/ubuntu-conflicts
...
Add "Conflicts" to our lxc-docker package
Upstream-commit: b10cfaef62e7cad53e300ae3640c846bef8831f6
Component: engine
2014-02-18 11:49:47 -07:00
27672a2f55
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6d1c0a91f89887bd0d73b161b1ffe8b9cc10365e
Component: engine
2014-02-18 11:24:33 -07:00
b0d22755b4
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ccb30a0e5d1146dddaec340643d3950e6f992ef
Component: engine
2014-02-18 11:23:37 -07:00
618b40aae5
Merge pull request #4198 from alexlarsson/fix-setuid
...
archive: Fix the storing of setuid bits, etc
Upstream-commit: 6af6b72023d68031e73aaf092bb7803ce38af95c
Component: engine
2014-02-18 13:11:32 -05:00
f829291e78
archive: Fix the storing of setuid bits, etc
...
In commit 3dfc910d7774d57c533b067fbe59d6b24dd803cd we changed from
syscall.Chmod() to os.Chmod(), but these take a different form of the
Mode argument. The sycall one takes the raw linux form, wheras
os.Chmod takes the os.FileMode form, and they differ for the higher
bits (setuid, setgid, etc). The raw tar header uses a form which
is compatible with the syscalls, but not the go calls.
We fix this by using hdr.FileInfo() which properly converts the mode
to what go expects.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5ba24629610c27f08b54ff4c1f000ad6d787c156
Component: engine
2014-02-18 09:53:30 +01:00
5633a3d1c6
Merge pull request #4196 from mahata/fixTypo
...
Fix typo in 'Using Supervisor with Docker' example
Upstream-commit: ef844adc3e2ba7ae702109c1bae54668a6a74aac
Component: engine
2014-02-17 22:48:54 -05:00
92abc1e651
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
Upstream-commit: 68de32888b6bad84cd37ccd165b0e7bb013574af
Component: engine
2014-02-17 19:43:56 -08:00
d863661170
Merge pull request #4193 from creack/3964-add_tar-fix
...
Fix remote tar ADD behavior
Upstream-commit: 8f11a1a61f7e63eb15c505225d5ca15c4d545cf7
Component: engine
2014-02-17 20:37:42 -05:00
bf1c684667
Fix remote tar ADD behavior
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 98ce0cdb4f80550462675ee3bbb927451bb76585
Component: engine
2014-02-17 17:08:17 -08:00
587e65afdf
Merge pull request #4159 from crosbymichael/move-volumes
...
Move volumes out of container.go and into volumes.go
Upstream-commit: a3bc3bb8c338f3fb40202681dd8bd933851a651b
Component: engine
2014-02-17 16:43:20 -08:00
bd991a8a29
Merge pull request #4162 from crosbymichael/movelinks
...
Move links functionality into pkg
Upstream-commit: e9db157bee3719e9c23779446dd23f84a870c92b
Component: engine
2014-02-17 16:34:47 -08:00
e253c6c2c6
Merge pull request #4168 from crosbymichael/add-listenbuffer
...
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
2014-02-17 16:04:49 -08:00
5806254d06
Merge pull request #4192 from crosbymichael/fix-404
...
Fix error message only if no body is retuned
Upstream-commit: 045462a36742a7821dd277eb63fc61a840451424
Component: engine
2014-02-18 01:49:08 +02:00
cf7d93d809
Improve error message only if no body is returned
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e23190b6b3ddd16b3a5f951a33e05fd75ebb8970
Component: engine
2014-02-17 15:29:52 -08:00
78488bf1e6
Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message"
...
This reverts commit 6dd1bb9eb08dc144bc172b0052df7c3904896e56, reversing
changes made to 23aec9d7fcaa72db026c042046102b381e2e9d27.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d55cc64c4eb66c4ee536514e35e2e2094aa3d911
Component: engine
2014-02-17 15:25:00 -08:00
7dcf535f27
Move job register into servapi
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e743021193e589b1358d0eef0521e9d8878dd66d
Component: engine
2014-02-17 15:10:51 -08:00
e9b88ec705
Merge pull request #4153 from crosbymichael/move-proxy
...
Move proxy into pkg
Upstream-commit: 518670f3d82ad8f0a9568ef5231d5e4af26860b2
Component: engine
2014-02-17 14:51:16 -08:00
f0b82b1858
Merge pull request #4188 from unclejack/update_dns_resolver_warning
...
update warning about local dns resolvers
Upstream-commit: 14ed82fc892318541ff887ec01c02e6feaa63dcd
Component: engine
2014-02-17 14:39:59 -08:00
51cf4f7bfe
Merge pull request #4171 from SvenDowideit/4061-remote-api-warning
...
change the -H TCP / docker group warning to not reference a resolved issue
Upstream-commit: c7c825d9a5f53be6f868ff401b1d61cda14e83fe
Component: engine
2014-02-17 14:36:05 -08:00
3c1481ab58
Merge pull request #4155 from crosbymichael/remove-reflink
...
Remove unused reflink files
Upstream-commit: 66c92140c9792f001972811572e97150bba37a99
Component: engine
2014-02-18 00:29:35 +02:00
5f4d37b73d
Remove verbose logging for non errors
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 055f1a1f8181d51d3386b4270f810efd59d51d30
Component: engine
2014-02-17 13:31:13 -08:00
7cfa188a75
update warning about local dns resolvers
...
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 85b8025a35c29e0832fd13adc55177758ecbb309
Component: engine
2014-02-17 23:29:36 +02:00
740924ecab
Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco
...
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
Upstream-commit: b7c2e8f54e6b76ec321c8c9c1f41dbc8b7c66a4e
Component: engine
2014-02-17 12:28:05 -08:00
d0ad73b7b0
Merge pull request #4178 from alexlarsson/fix-aufs-plnk
...
archive: Handle aufs plink hardlinks in ApplyLayer
Upstream-commit: 8f140b2deddb192f660baa04ab64c76e0b2f1cc2
Component: engine
2014-02-17 11:48:39 -08:00
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
