toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,201 Commits 3 Branches 295 Tags
b82d2b880101df55a808119e45fe22787fae1dce
Commit Graph
4201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 1fdd529660 Update ubuntu packaging script, especially to stop docker group deletion 
Upstream-commit: 498b6031b12da56c442d7c2b501f500766652b2d
Component: engine
 2013-11-08 17:23:37 -07:00
Andy Rothfusz bac845ad0c Merge pull request #2590 from metalivedev/2585-addphplib 
Fix 2585 and clean up warning in contributing.rst
Upstream-commit: f26da9638fc7daf0fac6c138ac3b9b040aef19fb
Component: engine
 2013-11-08 15:35:24 -08:00
Guillaume J. Charmes af669b6f79 Merge pull request #2615 from jpoimboe/ghost-networking-fix 
setup network when reconnecting to ghost container
Upstream-commit: 126b17a0fff9dad720ab8e60563e7f92d781bd93
Component: engine
 2013-11-08 15:31:55 -08:00
Andy Rothfusz 90f6287bc3 Fix 2585, rebase to master 
Upstream-commit: 34d294c4615855dca1ff2399f9bed63885b33786
Component: engine
 2013-11-08 15:15:45 -08:00
Victor Vieux edd84b853d prevent deletion if image is used by a running container 
Upstream-commit: 45c2b5dc1a0d8f3658f012844f9d89fbb2290c42
Component: engine
 2013-11-08 15:01:01 -08:00
Tianon Gravi 0ed69503c9 Update release script to move https://get.docker.io/ubuntu/info to https://get.docker.io/ubuntu/ and provide a backwards-compatibility redirect (same for /builds/info) 
Upstream-commit: f56945d71bcce6e7d18b3471bf4744ddd70b1783
Component: engine
 2013-11-08 15:45:18 -07:00
Tianon Gravi db48d3cf28 Update release script with proper support for non-*.docker.io bucket URLs 
Upstream-commit: b8e7ec1b74fdeaeab56a8ffab801dcd87b7361ca
Component: engine
 2013-11-08 15:44:52 -07:00
Guillaume J. Charmes eb881bef2a Merge pull request #2611 from seancron/changelog-edit 
Removes duplicate changelog entry
Upstream-commit: 3bbe8ee0557a9961f96b228ece1b7ac2b6c64998
Component: engine
 2013-11-08 14:39:02 -08:00
Josh Poimboeuf 67c8d19777 setup network when reconnecting to ghost container 
Re-adding the line to setup the network when reconnecting to a ghost
container.  It was inadvertently removed by commit
31638ab2ad2a5380d447780f05f7aa078c9421f5.
Upstream-commit: 2448058ee23292e2a167bbd6a2e138ad99e8b3b8
Component: engine
 2013-11-08 16:28:41 -06:00
Sean Cronin 8e910346a3 Removes duplicate changelog entry 
Upstream-commit: ca174ae84d37d89af726fa41e25a11bdaeca2067
Component: engine
 2013-11-08 17:17:39 -05:00
Victor Vieux 30b875bb54 Merge pull request #2610 from stapelberg/patch-1 
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
Upstream-commit: f9dd0da182ee9ff7ac891884fa4720073130bed9
Component: engine
 2013-11-08 14:00:06 -08:00
Michael Stapelberg e5498d2e58 Return “err” instead of “nil” when MkdirAll() fails when binding a volume 
Upstream-commit: e7fdcc15c5eb3812c71dd61f22a8d77d3ae72e36
Component: engine
 2013-11-08 22:52:10 +01:00
Andy Rothfusz 08ddb7c17c Merge pull request #2526 from metalivedev/2074-AddKnownIssues 
Add Known Issue
Upstream-commit: 67b0b97a8f17c67e5599f4566c8a9e1a5bb401fe
Component: engine
 2013-11-08 12:14:04 -08:00
Guillaume J. Charmes d2333853d5 Merge pull request #2565 from danielnorberg/master 
lock around read operations in graph
Upstream-commit: 310fbe7bb77c36a0d548c50dc6b5b7358a495a6a
Component: engine
 2013-11-08 09:34:18 -08:00
Michael Crosby 9046a5ee9e Merge pull request #2593 from dotcloud/2578 
Fix mergeConfig with new ports
Upstream-commit: 3f2a5912eecfd54713e3b54bbf79be6702f13f25
Component: engine
 2013-11-08 09:23:06 -08:00
Michael Crosby fe2898af2e Merge pull request #2597 from dotcloud/deprecate_separate_tag 
Deprecate old tagging format
Upstream-commit: 65102d6b3644ff638bb6bf6cabb69af987e61004
Component: engine
 2013-11-08 09:15:47 -08:00
Michael Crosby 2455088293 Merge pull request #2599 from dotcloud/prevent_panic_wrong_api_use 
Prevent panic if you use API in a wrong way
Upstream-commit: 997a32706f5169ac1a6a9c3e34d5eae58ca8017d
Component: engine
 2013-11-08 09:09:03 -08:00
Guillaume J. Charmes d7936598e0 Merge pull request #2584 from dotcloud/docker-ci 
docker-ci production sync
Upstream-commit: 5cf6ad4565374f924cdf64427d4e7b4adce50b41
Component: engine
 2013-11-08 08:24:09 -08:00
Mark Allen 807e6a9bd8 Add ImageInsert tests 
Upstream-commit: bf8e0277bbd1c2df2310bc20ecc4003d1ed7a657
Component: engine
 2013-11-08 00:16:45 -06:00
David Sissitka 5090a5bd4b Make "docker insert" errors obvious 
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
 2013-11-08 00:15:19 -06:00
Victor Vieux b89c66d724 prevent panic if you use API in a wrong way 
Upstream-commit: 49d7b87cfc4385470a5ecf181f92c13b8391c002
Component: engine
 2013-11-07 18:54:00 -08:00
Victor Vieux 2f4c3fdf6d Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from 
Upstream-commit: f417c4b09955e3b250bec19a0d4b13ff30ba4e80
Component: engine
 2013-11-07 17:59:55 -08:00
Guillaume J. Charmes 600bb37cb7 Deprecate old tagging format 
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
 2013-11-07 17:30:51 -08:00
Guillaume J. Charmes 04b54bb7ce Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string 
Use string timestamp for docker events -since
Upstream-commit: 4f8b6c32830555d71fd1912610eeb82b66903821
Component: engine
 2013-11-07 15:47:41 -08:00
Sven Dowideit d03901e0ad Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user 
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
 2013-11-08 09:32:13 +10:00
Roberto Gandolfo Hashioka 163d4a5b8f - Included the sudo alternative as an example_header 
Upstream-commit: eba3c36b386f389953eda6315948577200c9bf2c
Component: engine
 2013-11-07 14:44:07 -08:00
Victor Vieux ce1bb0ce73 fix mergeConfig with new ports 
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
 2013-11-07 14:31:25 -08:00
Josh Poimboeuf 07f796bd96 network: add iptables rules to explicitly allow forwarding 
Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
Upstream-commit: ec4657b28a3e97447921357d454df974e0979ac6
Component: engine
 2013-11-07 16:23:39 -06:00
Roberto Gandolfo Hashioka c81beb4bbc - Fix the attach examples according to the new attach behavior 
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
Upstream-commit: 304d39cc505ff51682dd7e1337f9f0ab7536eec3
Component: engine
 2013-11-07 14:06:49 -08:00
Michael Crosby e285c55a83 Merge pull request #2589 from dotcloud/gofmt 
Go fmt
Upstream-commit: cd4f7321c932efe2c95e221e2e685856c79ef30d
Component: engine
 2013-11-07 12:32:58 -08:00
Michael Crosby 8d5420a376 Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails 
Fix Assign id as name when all else fails
Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec
Component: engine
 2013-11-07 12:29:02 -08:00
Guillaume J. Charmes 6d24142423 go fmt 
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
 2013-11-07 12:27:33 -08:00
Victor Vieux b5fe937fc9 fix Assign id as name when all else fails 
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
 2013-11-07 12:23:29 -08:00
Andy Rothfusz 9fe27fc825 Fix 2585 and clean up warning in contributing.rst 
Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e
Component: engine
 2013-11-07 12:20:23 -08:00
Michael Crosby 61da922aa3 Merge pull request #2561 from dotcloud/add_iptabled_errors 
Make iptable return an error in case of output
Upstream-commit: b5c984f9b4899d577430134135379b0088d88b47
Component: engine
 2013-11-07 09:15:09 -08:00
Daniel Mizyrycki ba4e682cde docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD. 
Upstream-commit: 249f76bebdb3c24ae0a59e3be7ae73fd1d88c065
Component: engine
 2013-11-06 20:05:26 -08:00
Daniel Mizyrycki 83a4080e03 docker-ci 0.40. Migrate docker-ci to Digital Ocean. 
Upstream-commit: e7df38dbd0c7bf2d27632809fc49cacb0cc7f869
Component: engine
 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 837c6b480c docker-ci 0.37. Patch hack/dind with latest code for docker-test. 
Upstream-commit: efb4c800a7c8167cf2202466a720c0fad7001a5d
Component: engine
 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 7a7c9f0f1d docker-ci 0.36. Patch hack/dind with latest code for nightly release to work. 
Upstream-commit: 0cbeda73910d6d1d3336da93c5f94df0bdd5fa44
Component: engine
 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki aac90cd92e docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease 
Upstream-commit: 17172276366fc3114ae52eb6c83aafbec004d5f3
Component: engine
 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 6b8ac9d257 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker 
Upstream-commit: 50dd9791f75efef77a85bbe6556c85de0d845c0a
Component: engine
 2013-11-06 19:13:58 -08:00
Andy Rothfusz 80db89881c Fix bold 
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
 2013-11-06 18:07:55 -08:00
andy diller 9970f516fc updated create, showing how to set expose port and bind to public port for ssh 
Upstream-commit: 2d1155407a6e24b595d2627af6fa9f9f702483d2
Component: engine
 2013-11-06 18:07:55 -08:00
Andy Rothfusz d4449d4111 Merge pull request #2557 from jamtur01/new_redis 
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
Upstream-commit: 37dcff0c13c6e4ee71b22b7e4902c2e4b4b88132
Component: engine
 2013-11-06 17:54:34 -08:00
Andy Rothfusz 493375c769 Merge pull request #2567 from mck-/patch-1 
Add -p when running the container (node example)
Upstream-commit: 38f1838e821822037f334dc4aee1da9a3c76c53c
Component: engine
 2013-11-06 17:34:11 -08:00
Andy Rothfusz a16746b24c Merge pull request #1794 from justone/add-images-tree 
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
 2013-11-06 16:12:36 -08:00
Victor Vieux 0e9c1fdcf5 Merge pull request #2577 from dotcloud/bump_v0.6.6 
Bump v0.6.6
Upstream-commit: cb1c90975bbb2b3962b2ba611c58adac69bcf0c1
Component: engine
 2013-11-06 13:41:52 -08:00
Nate Jones 85bf6b92cb updating cli help doc for images 
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
 2013-11-06 12:03:45 -08:00
Alexander Larsson 5edb271922 lxc: Work around lxc-start need for private mounts 
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.

We work around this by starting up lxc-start in its own namespace where
we set / to rshared.

Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
Upstream-commit: 157d99a72786c454dfaad8b0800914cc80879aa8
Component: engine
 2013-11-06 20:43:06 +01:00
Victor Vieux 7bfea51316 Bump version to v0.6.6 
Upstream-commit: 360a694c52a48e0305317a18c59dc5ddc44859ad
Component: engine
 2013-11-06 11:43:02 -08:00