toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,115 Commits 3 Branches 295 Tags
74719b69d1a353e42269430ea6dfd71d322082bd
Commit Graph
4115 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 4a3b02d57d Merge pull request #2633 from danderson/2598-fix-iptables-anydest 
Correctly express "any address" to iptables.
Upstream-commit: 2fc0084f6b27f2a333e40cc74e50eb68490c2c4a
Component: engine
 2013-11-11 10:22:02 -08:00
Tianon Gravi 97bc55ee5d Add /etc/default/docker support to upstart, too (mirroring sysvinit) 
Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815
Component: engine
 2013-11-11 11:13:16 -07:00
Tianon Gravi 60cd8ebc40 Fix sysvinit upstart detection and give it a pretty message 
Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7
Component: engine
 2013-11-11 11:10:19 -07:00
Andy Rothfusz 0d32d7f5f1 Merge pull request #2574 from crosbymichael/api-port-changes 
Update documentation to reflect changes in Config and HostConfig
Upstream-commit: 1d9139bb890667fcd437a7316d2ff1b9a41dc250
Component: engine
 2013-11-11 09:59:48 -08:00
Guillaume J. Charmes a52e1003c4 Make sure docker kill exit with failure in case of error 
Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0
Component: engine
 2013-11-11 09:15:51 -08:00
Guillaume J. Charmes 504a744b38 Fix formatting in tests 
Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4
Component: engine
 2013-11-11 09:05:38 -08:00
Fabio Rehm f7888fafe9 Update contrib/vagrant-docker with projects available 
Upstream-commit: 9c7a8edddd447e64069f0cd108bee4d008049c49
Component: engine
 2013-11-11 13:36:44 -02:00
Ramkumar Ramachandra 8c7ea81910 CONTRIBUTING: wrap a couple of long lines 
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Upstream-commit: cf30b85eb1d3ecbf27c35ea344a5f68934c1bd2b
Component: engine
 2013-11-11 16:21:34 +05:30
Galen Sampson ab0419261e Vagrantfile updates. 
- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Upstream-commit: ccbb5d34927dc1905984bead3ebb576c0ea20960
Component: engine
 2013-11-10 23:39:26 -08:00
James Turnbull a33628fd7c Added status column to API client table 
Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590
Component: engine
 2013-11-10 12:14:45 -05:00
Mark Allen 9fcdb45469 Edits after code review 
Return long image ID
Return streamformatted error or "raw" error
Upstream-commit: 8cc19765b48d1a429b840b731ed5fd5b81fbda3c
Component: engine
 2013-11-10 00:06:55 -06:00
David Anderson 862e9a4dae Correctly express "any address" to iptables. 
Iptables interprets "-d 0.0.0.0" as "-d 0.0.0.0/32", not /0. This
results in the DNAT rule never matching any traffic if not bound
to a specific host IP.

Fixes #2598
Upstream-commit: 8ba8783bcc0ec3a0c5391445d52e2b2a9d0a3f8a
Component: engine
 2013-11-09 19:40:56 -08:00
Roberto Gandolfo Hashioka 311c5ef875 - Updated description 
Upstream-commit: 4ec0b515786ce266234d350fee872764974d2218
Component: engine
 2013-11-09 11:08:43 -08:00
Tianon Gravi e4cf9cf4dc Fix the display of get.docker.io in Firefox by making our index files text/plain 
Upstream-commit: 7f1b179c67476efa7dbafda55541b515fbe0f346
Component: engine
 2013-11-09 02:28:04 -07:00
Sven Dowideit d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098) 
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
 2013-11-09 12:16:49 +10:00
Roberto Gandolfo Hashioka f4773a7d1f - Added delete all the containers example 
Upstream-commit: 403f9fc357d64ccbdf82e1c4cbad2946eb1d1080
Component: engine
 2013-11-08 16:47:42 -08:00
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
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
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