Solomon Hykes
3569d080af
New engine command: 'wait'
2013-12-06 23:05:21 +00:00
Andy Rothfusz
7fd64e0196
Merge pull request #3088 from SvenDowideit/start-cmdline-examples-with-dollar-for-easier-testing
...
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-06 13:37:02 -08:00
Sven Dowideit
13da09d22b
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-07 07:23:53 +10:00
Andy Rothfusz
d75fc6e529
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
2013-12-06 11:25:10 -08:00
Andy Rothfusz
4a148919c3
Merge pull request #3052 from shawnl/patch-1
...
nftables dependancies in kernel
2013-12-06 11:02:49 -08:00
Guillaume J. Charmes
c7d75588f4
Merge pull request #3079 from crosbymichael/give-engine-noop-tests
...
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 10:43:39 -08:00
Guillaume J. Charmes
dfade9e2d8
Merge pull request #3095 from jpoimboe/missing-defines
...
devmapper: add missing defines
2013-12-06 10:31:42 -08:00
Guillaume J. Charmes
b655406faa
Merge pull request #3085 from tianon/fix-cgroup-dep
...
Revert "Add cgroup-bin dependency to our Ubuntu package"
2013-12-06 09:15:41 -08:00
Josh Poimboeuf
a015f38f4a
devmapper: add missing defines
...
Add some missing defines which are needed for compiling on older systems
like RHEL 6.
2013-12-06 10:13:47 -06:00
Michael Crosby
25d3db048e
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 01:18:18 -08:00
Shawn Landden
a69bb25820
specific kernel config
2013-12-05 23:54:23 -08:00
Andy Rothfusz
5f5949f6a6
Merge pull request #3086 from metalivedev/3045-addmirrors
...
Add debian mirrors. Fixes #3045 .
2013-12-05 18:16:28 -08:00
Andy Rothfusz
58b75f8f29
Add debian mirrors. Fixes #3045 .
2013-12-05 18:08:56 -08:00
Tianon Gravi
aea7418d8a
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
.
After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."
Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.
The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
2013-12-05 19:03:47 -07:00
Andy Rothfusz
f9147effac
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 17:40:42 -08:00
Andy Rothfusz
0e2b0f284c
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
2013-12-05 17:35:51 -08:00
Andy Rothfusz
80dfa23da8
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
2013-12-05 17:29:54 -08:00
Andy Rothfusz
4bea68dfa6
Clean up quoting, wraps, and build error on code-block.
2013-12-05 17:16:31 -08:00
Andy Rothfusz
ea0ed9a915
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
2013-12-05 17:03:26 -08:00
Guillaume J. Charmes
4acd579226
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
2013-12-05 16:41:43 -08:00
Victor Vieux
c764fb0c29
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
2013-12-05 16:41:01 -08:00
Victor Vieux
7a87023587
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
2013-12-05 16:16:55 -08:00
Tianon Gravi
584164177e
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
2013-12-05 16:07:59 -08:00
Victor Vieux
35e80868ad
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-05 16:04:09 -08:00
Tianon Gravi
2acea6090f
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
2013-12-05 16:01:04 -08:00
Andy Rothfusz
81b25fde79
Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
...
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
2013-12-05 15:27:36 -08:00
Andy Rothfusz
0189a99471
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 15:25:09 -08:00
Michael Crosby
7bf3a07371
If container does not exist try to remove the name and continue
2013-12-05 15:22:21 -08:00
Andy Rothfusz
9320f4e2d1
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
2013-12-05 15:17:34 -08:00
Guillaume J. Charmes
d1a4f83e5e
Merge pull request #3075 from dotcloud/pull_layers
...
Wait on pull from another client
2013-12-05 14:47:39 -08:00
Victor Vieux
fb810b54ff
wait on pull from another client
2013-12-05 14:41:56 -08:00
Pierre-Alain RIVIERE
eac95671f5
refs #2490 : add a network page to docs
2013-12-05 23:40:33 +01:00
Michael Crosby
06379d8bd9
Merge pull request #2992 from jpoimboe/bridge-create-ioctl
...
Create the bridge device with ioctl
2013-12-05 14:40:03 -08:00
Andy Rothfusz
a96bf74397
include Red Hat Enterprise, should have part of #3011
...
oops, forgot the index!
2013-12-05 14:34:10 -08:00
Andy Rothfusz
cc0466bb68
Merge pull request #3011 from goldmann/rhel_instructions
...
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
2013-12-05 14:30:31 -08:00
Andy Rothfusz
0a7e0f0819
Merge pull request #3034 from rogaha/fix_doc_registry_index_spec
...
- Updated the doc according to the current implementation status
2013-12-05 14:24:13 -08:00
Guillaume J. Charmes
ef157cee30
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
2013-12-05 14:13:03 -08:00
Lokesh Mandvekar
7ab4f37d60
separate block for yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-05 16:11:33 -06:00
Lokesh Mandvekar
5d022f0445
add unofficial header back, yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-05 16:08:08 -06:00
Michael Crosby
697707e4af
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
2013-12-05 14:03:23 -08:00
Andy Rothfusz
e3c3f3c324
Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
...
add an example of docker ps, and also of link aliases
2013-12-05 14:00:53 -08:00
Guillaume J. Charmes
797bac2344
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
2013-12-05 13:58:01 -08:00
Josh Poimboeuf
7a94cdf8ed
create the bridge device with ioctl
...
On RHEL 6, creation of a bridge device with netlink fails. Use the more
backward-compatible ioctl instead. This fixes networking on RHEL 6.
2013-12-05 15:32:15 -06:00
Lokesh Mandvekar
61fbf3d8e2
yum upgrade on fedora not required before install
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-05 14:21:03 -06:00
Lokesh Mandvekar
f49eb29497
use mattdm/fedora in fedora doc and other cosmetic changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-05 14:03:17 -06:00
Guillaume J. Charmes
1525f71b5a
Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process
...
Add a proposal step for potential MAINTAINERS.
2013-12-05 11:28:30 -08:00
Guillaume J. Charmes
4188cd6bcd
Merge pull request #3024 from jamtur01/ubunturepo
...
Added note about Ubuntu curl installation
2013-12-05 11:27:46 -08:00
Andy Rothfusz
e304e8936b
Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
...
initial stab at writing a use/ambassador-pattern howto
2013-12-05 11:01:27 -08:00
Guillaume J. Charmes
066b961a0c
Merge pull request #3060 from dotcloud/sd_notify
...
sd_notify ready status when accepting API requests
2013-12-05 10:33:29 -08:00
Victor Vieux
f95f2789f2
add docs for the new json format
2013-12-05 10:12:22 -08:00