Commit Graph

5780 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
78155d5455 Merge pull request #4151 from crosbymichael/improve-404-client-message
Improve error message for 404 returned by daemon
Upstream-commit: 6dd1bb9eb08dc144bc172b0052df7c3904896e56
Component: engine
2014-02-14 11:57:56 -08:00
c4982cc052 Improve error message for 404 returned by daemon
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 190504472b4598eff7d7f6f53df4f813975ff5bb
Component: engine
2014-02-14 11:56:52 -08:00
677b80e93f Merge pull request #4010 from tianon/iceweasel
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
Upstream-commit: 23aec9d7fcaa72db026c042046102b381e2e9d27
Component: engine
2014-02-14 21:38:40 +02:00
13aaf53921 Drop EofReader
This is not used any more

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: d8c888b3f85a99e9f94348bb71a852b59162464a
Component: engine
2014-02-14 13:46:21 +01:00
e12f62e6df Properly close archives
All archive that are created from somewhere generally have to be closed, because
at some point there is a file or a pipe or something that backs them. So, we
make archive.Archive a ReadCloser. However, code consuming archives does not
typically close them so we add an archive.ArchiveReader and use that when we're
only reading.

We then change all the Tar/Archive places to create ReadClosers, and to properly
close them everywhere.

As an added bonus we can use ReadCloserWrapper rather than EofReader in several places,
which is good as EofReader doesn't always work right. For instance, many compression
schemes like gzip knows it is EOF before having read the EOF from the stream, so the
EofCloser never sees an EOF.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: f198ee525ad6862dce3940e08c72e0a092380a7b
Component: engine
2014-02-14 13:46:17 +01:00
12b909af88 archive.TarFilter() - properly close readers
CompressStream() now always returns a stream that is closable, and it never
closes the underlying writer. TarFilter() makes sure the decompressed stream
is closed at the and, as well as the PipeWriter.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 804690bd07dcc1da6d0707d081e40ec9a189a3b6
Component: engine
2014-02-14 12:56:55 +01:00
77b539f03c archive: Close decompressed streams
Various kinds of decompressed streams are really ReadClosers. For instance
gzip.NewReader() is, and the one returned from CmdStream is changed to be
because it returns a PipeReader which is a ReadCloser.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 0d9213f859e00459e9efee2c5164417c94d66d2f
Component: engine
2014-02-14 12:56:55 +01:00
1b472eb342 Merge pull request #4123 from tianon/darwin-shasum
Add shasum fallback to hack/make/dynbinary for Darwin
Upstream-commit: 32535e0b826a68973f59c4529418614453819750
Component: engine
2014-02-13 21:20:49 -07:00
f55687f256 Merge pull request #4135 from creack/console_support
Mount-bind the PTY as container console - allow for tmux/screen to run
Upstream-commit: 7aff7cc4bbc0e78c72e77429a79c32a7e7cfc0dc
Component: engine
2014-02-14 03:47:33 +02:00
fe6b466dfb Merge pull request #4134 from crosbymichael/fix-add-magic-regression
Fix regression with ADD of tar files
Upstream-commit: 1b8ec8ff1db1ddfd015b7079e39270672692fc70
Component: engine
2014-02-14 03:43:39 +02:00
308d858c86 Merge pull request #4128 from vieux/fix_header_content-type_api
Fix header content type api
Upstream-commit: 968f4800b51feb62916d1df83c5fbf17368ee6e1
Component: engine
2014-02-13 20:29:09 -05:00
3dbd63bc33 Mount-bind the PTY as container console - allow for tmux/screen to run
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 408ea0771a9cb3046b8e484dcfefe5233fcbb27a
Component: engine
2014-02-13 17:23:09 -08:00
20b4cea323 Fix regression with ADD of tar files
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cad7f7ee5002206511daee4a29f399e6665f5fab
Component: engine
2014-02-13 17:18:38 -08:00
8326694294 Merge pull request #4120 from apocas/master
Image tag endpoint HTTP code typo
Upstream-commit: a4d1da709eae456888a3bdc35cd7a04a06ead7cb
Component: engine
2014-02-13 15:49:45 -08:00
8158393ebb Merge pull request #4093 from stpierre/mkimage-yum
Fix bogus variable reference in mkimage-yum.sh
Upstream-commit: cc144418456d9c93b80e291e3f24750a41658665
Component: engine
2014-02-13 15:28:47 -07:00
a3e904b8c7 Merge pull request #4125 from maxamillion/maxamillion/add_redhat_sysvinit
Remove unneeded sysctl changes in sysvinit-redhat init script
Upstream-commit: 8d2a2ed457346cd4156cf71b87a06e38536eaeb6
Component: engine
2014-02-13 12:53:53 -07:00
3670248b8d Merge pull request #4108 from unclejack/remove_default_tcp_bind_address
disallow tcp:// from defaulting to 127.0.0.1:4243
Upstream-commit: 6cb0a7e04e23ea6bc8694a6a7489ce226e01151e
Component: engine
2014-02-13 11:44:31 -08:00
6ca6193a8d fix content-type for legacy
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0b403b35318a68d848bd9d7cddcf850d2fa7bfa7
Component: engine
2014-02-13 19:24:40 +00:00
1395c9829d fix content-type for job.Stdout.Add
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4611a6bdd3270e4a404cae2d23c54dd94521c4ae
Component: engine
2014-02-13 19:21:27 +00:00
c0c4c69b1a Merge pull request #4062 from alexlarsson/clean-shutdown
devmapper: Fix shutdown warnings
Upstream-commit: 9997d0c9ed031465b7bc6e4df6f62bcac3758305
Component: engine
2014-02-13 10:45:03 -08:00
83b45e3c01 Merge pull request #4103 from vieux/add_error_build-rm
add error to docker build --rm
Upstream-commit: 6f10f33387becb3a8470f9f65706d0df919b7e9b
Component: engine
2014-02-13 10:35:55 -08:00
f734c53533 remove unneeded sysctl changes in sysvinit-redhat init script
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
Upstream-commit: 4317011e21b4e4025a9c92c7dc255fbf62af573a
Component: engine
2014-02-13 12:11:38 -06:00