223e45f83c
Merge pull request #2613 from tianon/ubuntu-fpm-tweaks
...
Update ubuntu packaging script, especially to stop docker group deletion
Upstream-commit: ca113bb1b2403c73281911700959236e6cea1e4d
Component: engine
2013-11-11 12:01:40 -08:00
ae06d51230
Merge pull request #2630 from jamtur01/api_status
...
Added status column to API client table
Upstream-commit: 9ff36cb00c3b25971ca626cf8ad227822b05a798
Component: engine
2013-11-11 11:56:04 -08:00
d05cf98cbd
Merge pull request #2653 from tianon/sysvinit-upstart-check
...
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function
Upstream-commit: 2091b59721e67fb96fba2fe5c795e827be832722
Component: engine
2013-11-11 11:00:07 -08:00
10393910ab
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly)
...
Upstream-commit: 88edba7e86efc8d7e118a9863ab701f0b5493d62
Component: engine
2013-11-11 11:57:25 -07:00
62719e2bfe
Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic
...
Fix sysvinit upstart detection and give it a pretty message
Upstream-commit: 5fe4c9a39a50f46842504234dd487a4c6c5d2d1e
Component: engine
2013-11-11 10:39:51 -08:00
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
60cd8ebc40
Fix sysvinit upstart detection and give it a pretty message
...
Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7
Component: engine
2013-11-11 11:10:19 -07:00
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
504a744b38
Fix formatting in tests
...
Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4
Component: engine
2013-11-11 09:05:38 -08:00
a33628fd7c
Added status column to API client table
...
Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590
Component: engine
2013-11-10 12:14:45 -05:00
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
1fdd529660
Update ubuntu packaging script, especially to stop docker group deletion
...
Upstream-commit: 498b6031b12da56c442d7c2b501f500766652b2d
Component: engine
2013-11-08 17:23:37 -07:00
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
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
90f6287bc3
Fix 2585, rebase to master
...
Upstream-commit: 34d294c4615855dca1ff2399f9bed63885b33786
Component: engine
2013-11-08 15:15:45 -08:00
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
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
8e910346a3
Removes duplicate changelog entry
...
Upstream-commit: ca174ae84d37d89af726fa41e25a11bdaeca2067
Component: engine
2013-11-08 17:17:39 -05:00
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
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
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
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
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
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
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
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
b89c66d724
prevent panic if you use API in a wrong way
...
Upstream-commit: 49d7b87cfc4385470a5ecf181f92c13b8391c002
Component: engine
2013-11-07 18:54:00 -08:00
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
600bb37cb7
Deprecate old tagging format
...
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
2013-11-07 17:30:51 -08:00
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
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
ce1bb0ce73
fix mergeConfig with new ports
...
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
2013-11-07 14:31:25 -08:00
e285c55a83
Merge pull request #2589 from dotcloud/gofmt
...
Go fmt
Upstream-commit: cd4f7321c932efe2c95e221e2e685856c79ef30d
Component: engine
2013-11-07 12:32:58 -08:00
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
6d24142423
go fmt
...
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
b5fe937fc9
fix Assign id as name when all else fails
...
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
2013-11-07 12:23:29 -08:00
9fe27fc825
Fix 2585 and clean up warning in contributing.rst
...
Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e
Component: engine
2013-11-07 12:20:23 -08:00
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
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
83a4080e03
docker-ci 0.40. Migrate docker-ci to Digital Ocean.
...
Upstream-commit: e7df38dbd0c7bf2d27632809fc49cacb0cc7f869
Component: engine
2013-11-06 19:13:58 -08:00
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
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
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
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
80db89881c
Fix bold
...
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
2013-11-06 18:07:55 -08:00
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
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
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
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
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
