b60d444c4f
Merge pull request #2527 from jpoimboe/fedora-iptables-fix
...
Fix container networking on Fedora
Upstream-commit: d589cc36227702e40038704ab048efff23bc71d9
Component: engine
2013-11-11 15:12:40 -08:00
1e55bfad23
Merge pull request #2621 from rogaha/rm_del_all_example
...
- Added delete all the containers example (docker rm `docker ps -a -q`)
Upstream-commit: 69a9614cb4654616baf9fb849275d6ec74a13a33
Component: engine
2013-11-11 14:55:50 -08:00
b55bba158e
add wait, stop, start, restart, rm, rmi
...
Upstream-commit: e2ac0e6b806c094fd8a3b706653623c0c2aee861
Component: engine
2013-11-11 14:47:23 -08:00
b93991acb1
Add ability to exclude files from tar
...
Upstream-commit: 2c7f50a77dc281289387008b4a08656e7e5328be
Component: engine
2013-11-11 14:30:38 -08:00
e57467c180
Change crypto export notice to meet Debian requirements
...
Upstream-commit: 01dd7e74592b7b45c56d1187e7dcfaac39e67be1
Component: engine
2013-11-11 22:08:37 +00:00
a30846b548
use utils.ParseRepositoryTag instead of strings.split in docker images
...
Upstream-commit: 84a3600ea82d1a3ea235f1193092206c1f0c011a
Component: engine
2013-11-11 13:54:17 -08:00
30fca0b017
Merge pull request #2646 from fgrehm/contrib-vagrant
...
Update contrib/vagrant-docker with projects available
Upstream-commit: cb9e0aee485ea5b244cd1153644e7c558cd4b9a7
Component: engine
2013-11-11 13:49:15 -08:00
23b6b1b409
Merge pull request #2641 from artagnon/master
...
CONTRIBUTING: wrap a couple of long lines
Upstream-commit: 52d3137713c3083c28676c020bf90e95c6d44d03
Component: engine
2013-11-11 13:43:30 -08:00
6a146241db
Merge branch 'master' of https://github.com/zilin/docker into zilin-master
...
Conflicts:
container.go
Upstream-commit: 4c7d24bc8b4bf436ba72d98089767e72a8f3f960
Component: engine
2013-11-11 12:59:18 -08:00
abd8707658
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
2013-11-11 13:06:19 -08:00
846d1113e1
Merge pull request #2313 from wazboy/master
...
Vagrant AWS update
Upstream-commit: 6fab249b21a2555f58c4de468f1f63bb284dc021
Component: engine
2013-11-11 13:01:20 -08:00
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
86d455035f
Remove Differ and Changer interfaces
...
Add the methods to the Driver interface
to force the drivers to implement the methods
Upstream-commit: 4d1a537433ede2bbc75b0a4817e8121f9e03fd86
Component: engine
2013-11-11 12:10:53 -08:00
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
29829cd5d2
Just return the id; nothing else.
...
Upstream-commit: 62f873aa1f918fe4d303f6168f66d057e6776b18
Component: engine
2013-11-11 13:26:24 -06: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
675c173a12
Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories
...
Upstream-commit: ec6fe9f2007a0400a441b79c89bced5727589ba9
Component: engine
2013-11-11 18:56:21 +00: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
97bc55ee5d
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
...
Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815
Component: engine
2013-11-11 11:13:16 -07: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
dfe224141f
Merge pull request #19 from alexlarsson/dm-plugin-Diff-fallback
...
Implement fallback operation for driver.Diff()
Upstream-commit: e87c3ea34243eb398364927d93ef27ee560e5601
Component: engine
2013-11-11 10:09:12 -08: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
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
504a744b38
Fix formatting in tests
...
Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4
Component: engine
2013-11-11 09:05:38 -08:00
122fd6b9c2
Implement fallback operation for driver.Diff()
...
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
Upstream-commit: e82f8c1661f3fa18e4dc6ca3aebe4dcc46e8961b
Component: engine
2013-11-11 17:46:07 +01:00
f7888fafe9
Update contrib/vagrant-docker with projects available
...
Upstream-commit: 9c7a8edddd447e64069f0cd108bee4d008049c49
Component: engine
2013-11-11 13:36:44 -02:00
d30197ef54
archive.ChagesDir() - faster and better implementation
...
This replaces the current version with the latest version from the
dm branch. Advantages in this version:
We only scan each directory tree once, which means less i/o and less chance
of container changes inbetween the two scans causing inconsistencies.
We avoid comparing some fields for change detection:
* Inode
* size-in-blocks
These can change during a copy operation (e.g. in the dummy backend)
without needing to actually reflect a change in content or metadata.
* Ctime
Any copy operation will create a new Ctime value, and there is no
API to change it to the "source" value.
* size for directories
The size of a directory doesn't have to be the same just because you
recreated the same content as another director. Internal details in
the filesystem may make these different with no "real" change.
Upstream-commit: b6ef4bc9521346dc5066d71821c6cadfbeced9d3
Component: engine
2013-11-11 14:51:19 +01:00
8f13be5bb1
Remove devicemapper lazy initialization
...
We now always initialize devicemapper on startup, so
no need for the code that did lazy initialization, we
just delete it.
Upstream-commit: b5795749d1688f99df422dd7068b189e5b25e5e9
Component: engine
2013-11-11 13:29:27 +01:00
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
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
a33628fd7c
Added status column to API client table
...
Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590
Component: engine
2013-11-10 12:14:45 -05:00
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
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
311c5ef875
- Updated description
...
Upstream-commit: 4ec0b515786ce266234d350fee872764974d2218
Component: engine
2013-11-09 11:08:43 -08:00
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
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
7c76e102e9
Don't use drivers to store temporary image downloads
...
Upstream-commit: 948bb29d27dc7e367cd27003c059d83301b15c4f
Component: engine
2013-11-09 00:53:58 +00:00
f4773a7d1f
- Added delete all the containers example
...
Upstream-commit: 403f9fc357d64ccbdf82e1c4cbad2946eb1d1080
Component: engine
2013-11-08 16:47:42 -08:00
82d35959fb
Merge pull request #13 from crosbymichael/fix-volume-mount
...
Do not pass container information when creating a volume
Upstream-commit: 1f35531f396dba279b289a515416351568b96c0a
Component: engine
2013-11-08 16:35:00 -08:00
23a64a84bf
Merge pull request #12 from crosbymichael/core-driver-test-failures
...
Core driver test failures
Upstream-commit: f30c660f6fe5e313f24f1646f9b5aaa3b487f5ab
Component: engine
2013-11-08 16:33:53 -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
911620a74d
Do not pass container information when creating a volume
...
Upstream-commit: ddb27268c98941b9f8a131b7b5403eb4d44beebb
Component: engine
2013-11-08 16:11:57 -08: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
28000adccb
Allow drivers to export their own diff
...
Upstream-commit: 1eb00e1d5b375cb79d492f1c5cd95d7317bc543c
Component: engine
2013-11-08 15:32:50 -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
edd84b853d
prevent deletion if image is used by a running container
...
Upstream-commit: 45c2b5dc1a0d8f3658f012844f9d89fbb2290c42
Component: engine
2013-11-08 15:01:01 -08:00
