7e3fb2e06b
specific kernel config
...
Upstream-commit: a69bb25820df8951151c8c6cb5952ba5496463db
Component: engine
2013-12-05 23:54:23 -08:00
86392dd452
Merge pull request #3086 from metalivedev/3045-addmirrors
...
Add debian mirrors. Fixes #3045 .
Upstream-commit: 5f5949f6a695cd0e80275d95872580ededa46a81
Component: engine
2013-12-05 18:16:28 -08:00
6671f362c6
Add debian mirrors. Fixes #3045 .
...
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
2013-12-05 18:08:56 -08:00
900b5e498f
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
2013-12-05 17:40:42 -08:00
1a871cfdd1
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
Upstream-commit: 0e2b0f284c1acfbb152ccca77417b4e132a4355b
Component: engine
2013-12-05 17:35:51 -08:00
5115cf8685
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
2013-12-05 17:29:54 -08:00
fec117a06e
Clean up quoting, wraps, and build error on code-block.
...
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
2013-12-05 17:16:31 -08:00
41a5e644a5
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
...
Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84
Component: engine
2013-12-05 17:03:26 -08:00
522f629592
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
Upstream-commit: 4acd5792260fb688e13242b55edea938382e2ba3
Component: engine
2013-12-05 16:41:43 -08:00
bd4e7f6cb9
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
Upstream-commit: c764fb0c294a37b6cf9aad68822be9b349449e6e
Component: engine
2013-12-05 16:41:01 -08:00
f3927b33a8
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
Upstream-commit: 7a870235879462bc929f147e96927d2a5caeb407
Component: engine
2013-12-05 16:16:55 -08:00
9b49298d93
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
Upstream-commit: 584164177ea0036c4d3503bf45645b44a9bb05d5
Component: engine
2013-12-05 16:07:59 -08:00
3365b34767
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
Upstream-commit: 35e80868addd9ac5a2c1e006e650ac3e71f52c6a
Component: engine
2013-12-05 16:04:09 -08:00
abd44b15ab
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
Upstream-commit: 2acea6090f6071b66f546f4de72a7e59731ab467
Component: engine
2013-12-05 16:01:04 -08:00
dd568b3dd1
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
Upstream-commit: 81b25fde7998cb9f5720844e5d487f73c7942d07
Component: engine
2013-12-05 15:27:36 -08:00
8a00a3de0b
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
Upstream-commit: 0189a994715f0ca141c7af289ede6d553c12b78e
Component: engine
2013-12-05 15:25:09 -08:00
738aed6186
If container does not exist try to remove the name and continue
...
Upstream-commit: 7bf3a07371bb0baed21b59d60835ed2f4877b571
Component: engine
2013-12-05 15:22:21 -08:00
c8f60ad629
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
Upstream-commit: 9320f4e2d1caf0b3d84388808c23767543987fd0
Component: engine
2013-12-05 15:17:34 -08:00
b5ccf77471
Merge pull request #3075 from dotcloud/pull_layers
...
Wait on pull from another client
Upstream-commit: d1a4f83e5ec4b332c0d61ace7b03da5de2f6bebd
Component: engine
2013-12-05 14:47:39 -08:00
1181340954
wait on pull from another client
...
Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf
Component: engine
2013-12-05 14:41:56 -08:00
322ee3f0e8
refs #2490 : add a network page to docs
...
Upstream-commit: eac95671f50a65279f8c39341c4f3be680add98a
Component: engine
2013-12-05 23:40:33 +01:00
f74efb9865
Merge pull request #2992 from jpoimboe/bridge-create-ioctl
...
Create the bridge device with ioctl
Upstream-commit: 06379d8bd9bb82b5a5c2f84ccca6c56172abfd5c
Component: engine
2013-12-05 14:40:03 -08:00
f9d6ff33ee
include Red Hat Enterprise, should have part of #3011
...
oops, forgot the index!
Upstream-commit: a96bf7439774d905f72e835218c72a5b45da37c0
Component: engine
2013-12-05 14:34:10 -08:00
89905dc61d
Merge pull request #3011 from goldmann/rhel_instructions
...
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
Upstream-commit: cc0466bb685ad9c393e282860734282659a4b409
Component: engine
2013-12-05 14:30:31 -08:00
8592a6729a
Merge pull request #3034 from rogaha/fix_doc_registry_index_spec
...
- Updated the doc according to the current implementation status
Upstream-commit: 0a7e0f081958e3b12ad7941ace04af0fb5ef675b
Component: engine
2013-12-05 14:24:13 -08:00
629f490217
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
Upstream-commit: ef157cee30795229d781c6b91dafded75c3e96c0
Component: engine
2013-12-05 14:13:03 -08:00
18b9488ee1
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
2013-12-05 14:03:23 -08:00
754f4c422f
Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
...
add an example of docker ps, and also of link aliases
Upstream-commit: e3c3f3c324e37536cc582f91b8963ba10d337417
Component: engine
2013-12-05 14:00:53 -08:00
7dfca4d041
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
Upstream-commit: 797bac2344b17e1fe0ea2c629c12f0ab90907013
Component: engine
2013-12-05 13:58:01 -08:00
dccee4fb11
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.
Upstream-commit: 7a94cdf8edd917899a38a58917cd4439652047a1
Component: engine
2013-12-05 15:32:15 -06:00
8ece76c065
Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process
...
Add a proposal step for potential MAINTAINERS.
Upstream-commit: 1525f71b5acb388418ed5fe1de861e95f7a9572d
Component: engine
2013-12-05 11:28:30 -08:00
f81857be89
Merge pull request #3024 from jamtur01/ubunturepo
...
Added note about Ubuntu curl installation
Upstream-commit: 4188cd6bcd6d078ebf2bc72d5685970965453a96
Component: engine
2013-12-05 11:27:46 -08:00
370b2a74f3
Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
...
initial stab at writing a use/ambassador-pattern howto
Upstream-commit: e304e8936b4f23c875dfe18e07763642cdf73a64
Component: engine
2013-12-05 11:01:27 -08:00
655f0f72fa
Merge pull request #3060 from dotcloud/sd_notify
...
sd_notify ready status when accepting API requests
Upstream-commit: 066b961a0cf93c5edd0cd4084029e2027c1ab483
Component: engine
2013-12-05 10:33:29 -08:00
20fd83bd52
add docs for the new json format
...
Upstream-commit: f95f2789f274f3d98ea77cd6c10b899aa3db2dc6
Component: engine
2013-12-05 10:12:22 -08:00
f1ec7415d1
Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
...
Only tag the top-most layer when pushing to a registry
Upstream-commit: a8e99d923507e245f933599c94a061bfdc375452
Component: engine
2013-12-05 10:02:57 -08:00
94326d728b
docs/installation/google: add enabling Google Compute Engine step
...
Upstream-commit: 5a17c208cd4858a21d38b09e60ee8199880f02bb
Component: engine
2013-12-05 09:43:08 -08:00
9a46759761
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
...
Upstream-commit: e9bf971e69800f1189dd240d95972f5f0dcc3bec
Component: engine
2013-12-05 21:48:35 +10:00
534fc04e4e
- Added link to the source code repo on github
...
Upstream-commit: 909da5d5249880b02bad5fb893d12fe2a3fdd942
Component: engine
2013-12-04 21:08:44 -08:00
8519def9b4
add a little prose to tell the user that run creates a container, and then starts it
...
Upstream-commit: 04c32495f69a48c34b753b66d7cdc4f2c695f405
Component: engine
2013-12-05 14:20:16 +10:00
53cfdbe273
I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent
...
Upstream-commit: af020e2d67256d386e43741071dc4855735d92a3
Component: engine
2013-12-05 14:14:08 +10:00
25e3f85d24
Merge pull request #2991 from fortybillion/patch-1
...
API documentation: added format of Volumes and Binds parameters to "create" and "start"
Upstream-commit: 94d46a8d3a2278962c30c01e831754d6cefe9b2e
Component: engine
2013-12-04 18:32:19 -08:00
3776c7a304
Merge branch '2971-cleanconflicts'
...
Upstream-commit: ec9f2f1d0f8255913208dc1193c954629c57c91d
Component: engine
2013-12-04 18:26:45 -08:00
e5d73f33fc
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
Upstream-commit: 0bfa22124e87197be8ce47cee4e998eb9d6891b5
Component: engine
2013-12-04 18:25:58 -08:00
e0c7cf69e6
Merge pull request #2907 from goldmann/iptables-fix
...
Make sure the firewall rules are created even if the bridge interface is already created
Upstream-commit: 79031c4f8cd443a3d6fe26205b6d66830e306619
Component: engine
2013-12-04 18:04:57 -08:00
3f773fbd23
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
Upstream-commit: 5f55c1aee1a6acdce35f5d7be776104d66e44483
Component: engine
2013-12-04 17:57:10 -08:00
6e5bbd93f0
Add Sven Dowideit to docs maintainers
...
Upstream-commit: b4e21ad1da616ab46669401dc7d62a6e19b05619
Component: engine
2013-12-04 17:50:33 -08:00
9684769cb6
sd_notify ready status when accepting API requests
...
Upstream-commit: 97088ebef7c638f8175d7c61934642eeb2c054c4
Component: engine
2013-12-04 17:50:20 -08:00
8c8b421058
Merge pull request #3031 from jamtur01/docsmaintain
...
Add James Turnbull to docs maintainers
Upstream-commit: c35cebaa06477133a454ab8b2e3765e320ef8503
Component: engine
2013-12-04 17:48:45 -08:00
1a4bb9936c
Merge pull request #2993 from jpoimboe/rhel6-version-check
...
remove kernel version warning on rhel 6.5
Upstream-commit: 41b5e87873097e8d776f37c9034653f6b45a2c7d
Component: engine
2013-12-04 17:46:20 -08:00
