Victor Vieux
d589cc3622
Merge pull request #2527 from jpoimboe/fedora-iptables-fix
...
Fix container networking on Fedora
2013-11-11 15:12:40 -08:00
Andy Rothfusz
69a9614cb4
Merge pull request #2621 from rogaha/rm_del_all_example
...
- Added delete all the containers example (docker rm `docker ps -a -q`)
2013-11-11 14:55:50 -08:00
Victor Vieux
e2ac0e6b80
add wait, stop, start, restart, rm, rmi
2013-11-11 14:47:23 -08:00
Michael Crosby
2c7f50a77d
Add ability to exclude files from tar
2013-11-11 14:30:38 -08:00
Solomon Hykes
01dd7e7459
Change crypto export notice to meet Debian requirements
2013-11-11 22:08:37 +00:00
Victor Vieux
84a3600ea8
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-11 13:54:17 -08:00
Andy Rothfusz
cb9e0aee48
Merge pull request #2646 from fgrehm/contrib-vagrant
...
Update contrib/vagrant-docker with projects available
2013-11-11 13:49:15 -08:00
Andy Rothfusz
52d3137713
Merge pull request #2641 from artagnon/master
...
CONTRIBUTING: wrap a couple of long lines
2013-11-11 13:43:30 -08:00
Victor Vieux
4c7d24bc8b
Merge branch 'master' of https://github.com/zilin/docker into zilin-master
...
Conflicts:
container.go
2013-11-11 12:59:18 -08:00
Victor Vieux
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
Daniel Mizyrycki
6fab249b21
Merge pull request #2313 from wazboy/master
...
Vagrant AWS update
2013-11-11 13:01:20 -08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Michael Crosby
4d1a537433
Remove Differ and Changer interfaces
...
Add the methods to the Driver interface
to force the drivers to implement the methods
2013-11-11 12:10:53 -08:00
Tianon Gravi
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
Andy Rothfusz
9ff36cb00c
Merge pull request #2630 from jamtur01/api_status
...
Added status column to API client table
2013-11-11 11:56:04 -08:00
Mark Allen
62f873aa1f
Just return the id; nothing else.
2013-11-11 13:26:24 -06:00
Tianon Gravi
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
Tianon Gravi
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
Solomon Hykes
ec6fe9f200
Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories
2013-11-11 18:56:21 +00:00
Tianon Gravi
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
Michael Crosby
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
Tianon Gravi
7cf7dda87d
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-11 11:13:16 -07:00
Tianon Gravi
bb76157d24
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 11:10:19 -07:00
Solomon Hykes
e87c3ea342
Merge pull request #19 from alexlarsson/dm-plugin-Diff-fallback
...
Implement fallback operation for driver.Diff()
2013-11-11 10:09:12 -08:00
Andy Rothfusz
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
Guillaume J. Charmes
8149439d95
Make sure docker kill exit with failure in case of error
2013-11-11 09:15:51 -08:00
Guillaume J. Charmes
402a58a75a
Fix formatting in tests
2013-11-11 09:05:38 -08:00
Alexander Larsson
e82f8c1661
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.
2013-11-11 17:46:07 +01:00
Fabio Rehm
9c7a8edddd
Update contrib/vagrant-docker with projects available
2013-11-11 13:36:44 -02:00
Alexander Larsson
b6ef4bc952
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.
2013-11-11 14:51:19 +01:00
Alexander Larsson
b5795749d1
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.
2013-11-11 13:29:27 +01:00
Ramkumar Ramachandra
cf30b85eb1
CONTRIBUTING: wrap a couple of long lines
...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
2013-11-11 16:21:34 +05:30
Galen Sampson
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
James Turnbull
5a1bfd9aa9
Added status column to API client table
2013-11-10 12:14:45 -05:00
Mark Allen
8cc19765b4
Edits after code review
...
Return long image ID
Return streamformatted error or "raw" error
2013-11-10 00:06:55 -06:00
David Anderson
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
Roberto Gandolfo Hashioka
4ec0b51578
- Updated description
2013-11-09 11:08:43 -08:00
Tianon Gravi
7f1b179c67
Fix the display of get.docker.io in Firefox by making our index files text/plain
2013-11-09 02:28:04 -07:00
Sven Dowideit
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
Solomon Hykes
948bb29d27
Don't use drivers to store temporary image downloads
2013-11-09 00:53:58 +00:00
Roberto Gandolfo Hashioka
403f9fc357
- Added delete all the containers example
2013-11-08 16:47:42 -08:00
Michael Crosby
1f35531f39
Merge pull request #13 from crosbymichael/fix-volume-mount
...
Do not pass container information when creating a volume
2013-11-08 16:35:00 -08:00
Michael Crosby
f30c660f6f
Merge pull request #12 from crosbymichael/core-driver-test-failures
...
Core driver test failures
2013-11-08 16:33:53 -08:00
Tianon Gravi
498b6031b1
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-08 17:23:37 -07:00
Michael Crosby
ddb27268c9
Do not pass container information when creating a volume
2013-11-08 16:11:57 -08:00
Andy Rothfusz
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
Michael Crosby
1eb00e1d5b
Allow drivers to export their own diff
2013-11-08 15:32:50 -08:00
Guillaume J. Charmes
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
Andy Rothfusz
34d294c461
Fix 2585, rebase to master
2013-11-08 15:15:45 -08:00
Victor Vieux
45c2b5dc1a
prevent deletion if image is used by a running container
2013-11-08 15:01:01 -08:00