45e3eef148
Resolved conflict in conf.py
...
ps. also changed navigation (swapped community and getting started)
Upstream-commit: 6c87db97a629f3d7b7f6e276a515506bcca8dbb1
Component: engine
2013-08-13 16:28:24 -07:00
14d9fa64a4
Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes
...
Conflicts:
docs/sources/conf.py
Upstream-commit: f127c471a15050814f8d5b97b7a768f58756afff
Component: engine
2013-08-13 16:25:58 -07:00
f97e8fc164
[docs] Some user-friendly changes to the documentation.
...
- Added parmalinks (closes #1527 )
- Changed the 'fork us on github' button to 'Edit this page on github', so people can edit quickly (closes #1532 )
- Changed the favicon
Upstream-commit: f14db4934605235bd77e9d1dc22377ca710e4c7b
Component: engine
2013-08-13 16:18:32 -07:00
d7df5fa0e4
Merge pull request #1516 from unclejack/up_hack_dockerfile_go_version_to_1.1.2
...
use Go 1.1.2 for dockerbuilder
Upstream-commit: f1cdba29373cfd1a1da9133531b50a38d0f1ebe7
Component: engine
2013-08-13 14:50:12 -07:00
d208510d93
Merge pull request #1526 from metalivedev/1522-faqupdate
...
Added information about Docker's high level tools over LXC.
Upstream-commit: 0794f0b5181a5af9687b506e4c7c43ef5538d0fd
Component: engine
2013-08-13 13:57:47 -07:00
abcb5a7554
Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.
...
Upstream-commit: e2409ad3376baeb36d1011732f7d7b1a239320ae
Component: engine
2013-08-13 13:45:07 -07:00
acf69f10ad
Merge pull request #1501 from KSid/vagrant-dev-dockerfile
...
Install websocket library before building docker
Upstream-commit: ca92bc77982c07f8f06208bdace13862d9d40e71
Component: engine
2013-08-13 12:16:30 -07:00
0a73c1d7a8
Merge pull request #1515 from dotcloud/rework_auth_push
...
* Registry: Improve auth push
Upstream-commit: 9cc3d7a18b7ab7d56ff0eca49c2b4db30dc1c5a6
Component: engine
2013-08-13 10:15:59 -07:00
1a2d40b29b
use Go 1.1.2 for dockerbuilder
...
Upstream-commit: e09863fedb1b2fec4672d2d1ebad29ecdb8eed1a
Component: engine
2013-08-13 19:48:30 +03:00
15696699da
remove checkIfLogged
...
Upstream-commit: 2ba1300773857273585288c79aa65f011b045b4c
Component: engine
2013-08-13 14:02:49 +00:00
eb493ee13b
fix merge issue
...
Upstream-commit: 6cb908bb823409661bfedab806da924d232bf200
Component: engine
2013-08-13 13:35:34 +00:00
82ad117950
Merge pull request #1485 from dotcloud/1471-unixsocket-group
...
* Runtime: API, issue 1471: Use groups for socket permissions
Upstream-commit: f6760fca88b35e879d308d88eeae15fa80aa7c98
Component: engine
2013-08-12 16:21:53 -07:00
62138d17f2
Merge pull request #1508 from pborreli/typos
...
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00
fdc7c648cb
API, issue 1471: Allow users belonging to the docker group to use the docker client
...
Upstream-commit: 999a8d72492c7937aa9f826406ae40158017f766
Component: engine
2013-08-12 15:16:49 -07:00
64cd837579
Merge pull request #1504 from zaiste/docs/postgresql-service
...
docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: 13acf72a3e21fe1d1515deb6a421181817822086
Component: engine
2013-08-12 14:47:19 -07:00
02df6403ea
Merge pull request #1488 from KSid/336-bash-completion
...
* Contrib: bash completion script
Upstream-commit: aa213b48a47ed7d8d331c47719325cc7fa1210ed
Component: engine
2013-08-12 11:50:25 -07:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
48e3692cf2
Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser
...
* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot
Upstream-commit: 1110bb8e9855ee58a913289d4333a5baeb72bd53
Component: engine
2013-08-12 10:23:08 -07:00
29a3aefa15
Merge pull request #1491 from titanous/gitignore-test
...
gitignore all test files
Upstream-commit: 168e2f8c498840ae3cb0d644ec692eaeaf51e280
Component: engine
2013-08-12 09:18:31 -07:00
a503d396c8
Merge pull request #1487 from titanous/maintainer-usernames
...
Add GitHub usernames to MAINTAINERS
Upstream-commit: 86ef6422f346154419ebde41ff51614f5141258b
Component: engine
2013-08-12 09:07:10 -07:00
e65d5282fa
fix/docs: ubuntu instead of base, note about root-only
...
Upstream-commit: 3af60bf37565de35643c95eae9fd4ddc863c21fc
Component: engine
2013-08-12 15:30:52 +02:00
692cd4a096
Merge pull request #1494 from KSid/typo-docs-run-command
...
* Documentation: Fix typo in docs for docker run -dns
Upstream-commit: edba1af3046665bb771636e333942b0acfa87668
Component: engine
2013-08-12 04:51:56 -07:00
77c5165eea
Merge pull request #1499 from seldo/master
...
* Documentation: Adding a reference to ps -a
Upstream-commit: 875e16c11b90d3f897aef615a31dee7db0614ec7
Component: engine
2013-08-12 04:51:17 -07:00
f87f880dcc
docs/postgresql: PostgreSQL service on Docker example
...
Upstream-commit: d52c1490753cb924aa2aeeefc92fbe7a985f4cd3
Component: engine
2013-08-12 12:03:43 +02:00
cfdc1ec57f
Merge pull request #1497 from vincentbernat/fix/ipv4-forwarding-detection
...
runtime: correctly detect IPv4 forwarding
Upstream-commit: 3f95d1b9bfca277995cfcc82b2bfe2f77a2648ea
Component: engine
2013-08-12 02:07:03 -07:00
c5aa8d03ec
Install websocket library before building docker
...
Upstream-commit: def9598ed968eac934699db1b8717f852652b1ef
Component: engine
2013-08-12 05:22:33 +01:00
1c6718b33c
Adding a reference to ps -a
...
It was confusing to me as a first-time user that my docker attach command failed; I was expecting the container to run continuously, and when I couldn't attach to it, I assumed something was wrong. ps -a shows that the container still exists, which gives the user confidence to go to the next step.
Upstream-commit: 529ee848da1f1dd4b628c3396289b4bcffdbd540
Component: engine
2013-08-11 17:27:47 -07:00
8ef6c1627f
runtime: correctly detect IPv4 forwarding
...
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
Upstream-commit: 64b817a5c12545252d0cbb3d4ce1f23996bb266b
Component: engine
2013-08-11 11:52:16 +02:00
871898eda4
Merge pull request #1483 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: 940d58806c3e3d4409a7eee4859335e98139d09f
Component: engine
2013-08-10 21:16:34 -07:00
01d6467840
Fix typo in docs for docker run -dns
...
Upstream-commit: a2fb870ce30d87aa7a08cca4c2e45c4d021c99c4
Component: engine
2013-08-11 02:04:04 +01:00
44ac0a0f19
Still missed -entrypoint from 'docker run'
...
Upstream-commit: e737856a7f2c92f6cb582a12cc6f0b9fb4720d5a
Component: engine
2013-08-11 01:29:22 +01:00
7380689cdd
Clarified bash completion limitations
...
Upstream-commit: ae1909b4823e500798f224a3ea70f7faf644a2bc
Component: engine
2013-08-11 01:08:47 +01:00
11a33ac4b8
Missed -entrypoint from 'docker run' options
...
Upstream-commit: d75282eb147218bb7c6f4032e75b95a1ddd299cf
Component: engine
2013-08-11 00:57:18 +01:00
fe6378861a
Merge pull request #1489 from dotcloud/1422-revert-upstart
...
Revert "docker.upstart: avoid spawning a `sh` process"
Upstream-commit: cd9886f0a873e2d5bfb0fe058b34e442a304bc3b
Component: engine
2013-08-10 11:07:21 -07:00
45d797043b
gitignore all test files
...
Upstream-commit: a43bae4c0b6f3ec632636be544a6816f5f62dcb0
Component: engine
2013-08-10 13:48:24 -04:00
0dd9388168
Add description and usage information
...
Upstream-commit: 91ae1358966211826818ed452f13e3e2e27ed6cc
Component: engine
2013-08-10 13:05:31 +01:00
ee79dd7602
Revert "docker.upstart: avoid spawning a sh process"
...
This reverts commit 24dd50490a027f01ea086eb90663d53348fa770e.
Upstream-commit: e3acbff2edd04c8a7211ea078b24745749021efc
Component: engine
2013-08-10 03:06:08 +00:00
dbd3da9a6b
Add initial bash completion script
...
The script can be used to auto-complete commands, image names and
container ids from within a bash prompt.
This partially resolves #336 .
Upstream-commit: d6e5c2c276de458f36034d46f7b7f0f8efd24491
Component: engine
2013-08-10 02:38:11 +01:00
33c7b64d8e
Add GitHub usernames to MAINTAINERS
...
Upstream-commit: 4dc04d7690a4d634d9afd93821bb8e78620c5f9f
Component: engine
2013-08-09 21:16:44 -04:00
85d9c3236a
Merge pull request #1484 from titanous/use-range
...
Use ranged for loop on channels
Upstream-commit: 3e12349831903a11c67a9ca40a0d566e428aa876
Component: engine
2013-08-09 18:06:12 -07:00
66d2ddf8c5
Use ranged for loop on channels
...
Upstream-commit: 7c50221de5ec1066f0f04d6db94ee9c2fef98efb
Component: engine
2013-08-09 20:42:20 -04:00
51ecc0b473
Merge pull request #1481 from titanous/fix-sprint
...
Fix typo: fmt.Sprint -> fmt.Sprintf
Upstream-commit: 3d63087f78ff2ace86d5ea0331e32418914438b8
Component: engine
2013-08-09 17:28:59 -07:00
99c7db4cc9
Update AUTHORS
...
Upstream-commit: 1408f08c40f73ccf0204334ceb44ac482c5641e9
Component: engine
2013-08-09 20:09:42 -04:00
204241346e
Fix typo: fmt.Sprint -> fmt.Sprintf
...
Upstream-commit: 3b23f02229fd3f4928934f317d41b8f497cec9a9
Component: engine
2013-08-09 19:52:05 -04:00
dd00bdcd04
Merge pull request #1479 from jpetazzo/fix-testbindmounts-typo
...
- Tests: fix typo in TestBindMounts (runContainer called without image)
Upstream-commit: fd5099c9fec49004f19d5a1200d0debfb9a365a7
Component: engine
2013-08-09 16:20:24 -07:00
ca934a037f
fix typo in TestBindMounts (runContainer called without image)
...
Upstream-commit: 68b09cbe3d0a13bd1dbcaa39a63788fe938d0ae7
Component: engine
2013-08-09 16:03:05 -07:00
cf78c6ec1e
Merge pull request #1146 from benoitc/feature/attach_ws
...
* Runtime: add websocket support to /container/<name>/attach/ws
Upstream-commit: 92cd2f5badd402e0f9738114004f0223a92f6016
Component: engine
2013-08-09 15:38:24 -07:00
42fa1cc5fa
Merge pull request #1460 from dotcloud/patch1
...
* Runtime: Mount /dev/shm as a tmpfs
Upstream-commit: 8d1cd63dfa7fddba5d4b290b1d2b59d3cd1dca48
Component: engine
2013-08-09 15:18:22 -07:00
0c080883ce
Merge pull request #1477 from kevinclark/builder-fixme
...
Only count known instructions as build steps
Upstream-commit: 2c4c10fb4ab6bb114ae0bf5ee46f41c2cf561d7c
Component: engine
2013-08-09 14:45:06 -07:00
335d59ebfb
Add myself to AUTHORS
...
Upstream-commit: 722d4e916a727716f7f7b330c8fbea4bc089d62f
Component: engine
2013-08-09 14:39:03 -07:00
