toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,278 Commits 3 Branches 295 Tags
e9b88ec705f08b1e5fa22ddf6cd33779d40b5944
Commit Graph
6278 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux 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
Victor Vieux 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
Andy Rothfusz 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
unclejack 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
Michael Crosby 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
unclejack 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
Victor Vieux 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
Victor Vieux 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
Alexander Larsson 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
Victor Vieux 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
Michael Crosby 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Michael Crosby 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
unclejack 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
Guillaume J. Charmes 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
Daniel Mizyrycki 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
Tianon Gravi 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
Michael Crosby 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
Daniel Mizyrycki 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
Victor Vieux 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
Guillaume J. Charmes 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
Travis Cline 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
Michael Crosby 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
Song Gao 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
unclejack 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
Tianon Gravi 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
James Turnbull 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
Alexander Larsson 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
Mike MacCana 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
Fabio Falci 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
Sven Dowideit 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
Sven Dowideit 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
Fabio Falci 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
Michael Crosby 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
Michael Crosby 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Victor Vieux 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Victor Vieux 59b0ef3a94 Merge pull request #4152 from crosbymichael/update-fixme 
Update fixme
Upstream-commit: 072268ae5696be77afa93836b45de4b78b16bd63
Component: engine
 2014-02-14 15:19:16 -08:00
Michael Crosby 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
Victor Vieux 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
Michael Crosby 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