4c7d24bc8b
Merge branch 'master' of https://github.com/zilin/docker into zilin-master
...
Conflicts:
container.go
2013-11-11 12:59:18 -08:00
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
6fab249b21
Merge pull request #2313 from wazboy/master
...
Vagrant AWS update
2013-11-11 13:01:20 -08:00
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
ca113bb1b2
Merge pull request #2613 from tianon/ubuntu-fpm-tweaks
...
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-11 12:01:40 -08:00
9ff36cb00c
Merge pull request #2630 from jamtur01/api_status
...
Added status column to API client table
2013-11-11 11:56:04 -08:00
2091b59721
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
2013-11-11 11:00:07 -08:00
88edba7e86
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)
2013-11-11 11:57:25 -07:00
5fe4c9a39a
Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic
...
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 10:39:51 -08:00
2fc0084f6b
Merge pull request #2633 from danderson/2598-fix-iptables-anydest
...
Correctly express "any address" to iptables.
2013-11-11 10:22:02 -08:00
bb76157d24
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 11:10:19 -07:00
1d9139bb89
Merge pull request #2574 from crosbymichael/api-port-changes
...
Update documentation to reflect changes in Config and HostConfig
2013-11-11 09:59:48 -08:00
402a58a75a
Fix formatting in tests
2013-11-11 09:05:38 -08:00
ccbb5d3492
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.
2013-11-10 23:39:26 -08:00
5a1bfd9aa9
Added status column to API client table
2013-11-10 12:14:45 -05:00
8ba8783bcc
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
2013-11-09 19:40:56 -08:00
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
498b6031b1
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-08 17:23:37 -07:00
f26da9638f
Merge pull request #2590 from metalivedev/2585-addphplib
...
Fix 2585 and clean up warning in contributing.rst
2013-11-08 15:35:24 -08:00
126b17a0ff
Merge pull request #2615 from jpoimboe/ghost-networking-fix
...
setup network when reconnecting to ghost container
2013-11-08 15:31:55 -08:00
34d294c461
Fix 2585, rebase to master
2013-11-08 15:15:45 -08:00
3bbe8ee055
Merge pull request #2611 from seancron/changelog-edit
...
Removes duplicate changelog entry
2013-11-08 14:39:02 -08:00
2448058ee2
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
31638ab2ad
2013-11-08 16:28:41 -06:00
ca174ae84d
Removes duplicate changelog entry
2013-11-08 17:17:39 -05:00
f9dd0da182
Merge pull request #2610 from stapelberg/patch-1
...
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
2013-11-08 14:00:06 -08:00
e7fdcc15c5
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
2013-11-08 22:52:10 +01:00
67b0b97a8f
Merge pull request #2526 from metalivedev/2074-AddKnownIssues
...
Add Known Issue
2013-11-08 12:14:04 -08:00
310fbe7bb7
Merge pull request #2565 from danielnorberg/master
...
lock around read operations in graph
2013-11-08 09:34:18 -08:00
3f2a5912ee
Merge pull request #2593 from dotcloud/2578
...
Fix mergeConfig with new ports
2013-11-08 09:23:06 -08:00
65102d6b36
Merge pull request #2597 from dotcloud/deprecate_separate_tag
...
Deprecate old tagging format
2013-11-08 09:15:47 -08:00
997a32706f
Merge pull request #2599 from dotcloud/prevent_panic_wrong_api_use
...
Prevent panic if you use API in a wrong way
2013-11-08 09:09:03 -08:00
5cf6ad4565
Merge pull request #2584 from dotcloud/docker-ci
...
docker-ci production sync
2013-11-08 08:24:09 -08:00
49d7b87cfc
prevent panic if you use API in a wrong way
2013-11-07 18:54:00 -08:00
f417c4b099
Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from
2013-11-07 17:59:55 -08:00
ef57752bce
Deprecate old tagging format
2013-11-07 17:30:51 -08:00
4f8b6c3283
Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string
...
Use string timestamp for docker events -since
2013-11-07 15:47:41 -08:00
01fea3cf11
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
2013-11-08 09:32:13 +10:00
49c4231f07
fix mergeConfig with new ports
2013-11-07 14:31:25 -08:00
cd4f7321c9
Merge pull request #2589 from dotcloud/gofmt
...
Go fmt
2013-11-07 12:32:58 -08:00
132db329d4
Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails
...
Fix Assign id as name when all else fails
2013-11-07 12:29:02 -08:00
6998c3c387
go fmt
2013-11-07 12:27:33 -08:00
26f846bf77
fix Assign id as name when all else fails
2013-11-07 12:23:29 -08:00
97c3de7e6b
Fix 2585 and clean up warning in contributing.rst
2013-11-07 12:20:23 -08:00
b5c984f9b4
Merge pull request #2561 from dotcloud/add_iptabled_errors
...
Make iptable return an error in case of output
2013-11-07 09:15:09 -08:00
249f76bebd
docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
2013-11-06 20:05:26 -08:00
e7df38dbd0
docker-ci 0.40. Migrate docker-ci to Digital Ocean.
2013-11-06 19:13:58 -08:00
efb4c800a7
docker-ci 0.37. Patch hack/dind with latest code for docker-test.
2013-11-06 19:13:58 -08:00
0cbeda7391
docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
2013-11-06 19:13:58 -08:00
1717227636
docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease
2013-11-06 19:13:58 -08:00
50dd9791f7
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-11-06 19:13:58 -08:00
Victor Vieux