caadb4bcda
Show tag used when image is missing
...
Upstream-commit: 07a887032af78e5014d635f7e1d669d49b50894d
Component: engine
2013-08-17 20:03:54 -07:00
5293419556
Merge pull request #1550 from dotcloud/update-dependencies-in-readme
...
Update readme with dependencies for building
Upstream-commit: 1843a719117daff94b642e2e4a5b7a5db9e3fd6b
Component: engine
2013-08-16 17:46:25 -07:00
8abf315e25
Merge pull request #1572 from dotcloud/1431-disable-TestContainerTop
...
Tests: testing, issue #1431 : Temporarely disable TestContainerTop from the testsuite
Upstream-commit: 9ce577782c96ae70e58799f7c0fd4cfd79ae71b8
Component: engine
2013-08-16 14:49:02 -07:00
5f40dd8383
testing, issue #1431 : Temporarely disable TestContainerTop from the testsuite
...
Upstream-commit: 422d4afdd544656c847ecd4c62a6965d5974eba5
Component: engine
2013-08-16 14:47:39 -07:00
2a164a3079
Merge pull request #1569 from TylerBrock/patch-1
...
Add instructions for creating and using the docker group
Upstream-commit: 09a08e0a9f17864f5740970a715de836aff8babb
Component: engine
2013-08-16 14:30:00 -07:00
18849e9231
Merge pull request #1473 from shin-/978-opaque-v2
...
Reworking opaque requests in registry module
Upstream-commit: 5142e83d93176547c78749d611071c20ee12f824
Component: engine
2013-08-16 12:24:51 -07:00
a51aec19e0
registry: removing opaqueRequest
...
Upstream-commit: 0418702cfc69f3d748c7c8b00da467154944b540
Component: engine
2013-08-16 19:33:59 +02:00
7830299d44
remove extraneous step and stupid whitespace
...
Upstream-commit: 674e5c850374fffa03fb205ae6b623ec069978d9
Component: engine
2013-08-16 13:30:54 -04:00
e204ad6458
Add instructions for creating and using the docker group
...
Upstream-commit: 2ec141da542ab7563c7104b3a950bc503e4959fb
Component: engine
2013-08-16 13:19:59 -04:00
bb7828b2e8
Update readme with dependencies for building
...
Closes #915
Upstream-commit: bca19a22c50d3ff085c8d7accf35d35e6dde4d6a
Component: engine
2013-08-15 17:26:07 +00:00
4bbf51df9b
Merge pull request #1551 from dotcloud/hotfix_parallel_pull_display
...
hot fix display in parallel pull and gofmt
Upstream-commit: 92a2b635a32153613f6f3592246b18539565ec7c
Component: engine
2013-08-15 04:43:26 -07:00
6fda0862e2
hot fix display in parallel pull and go fmt
...
Upstream-commit: d7979ef2d0044dc7def9238f0a1aed909f0590bb
Component: engine
2013-08-15 11:42:40 +00:00
5c27340e61
Merge pull request #1495 from bdon/master
...
Fix Graph ByParent() to generate list of child images per parent image.
Upstream-commit: c5d8844d80e2c1ec3021662dd97e6a812a922258
Component: engine
2013-08-14 20:42:34 -07:00
4c1b9a690a
Merge pull request #1549 from dotcloud/fix-logevent-tests
...
Add imagename to LogEvent tests
Upstream-commit: 4caa6047934ad3046847d8802520615dec785e92
Component: engine
2013-08-14 17:02:53 -07:00
cff1278317
Add imagename to LogEvent tests
...
Upstream-commit: 7f9ba14b18e171589a82e8dd3bd084ece3405f83
Component: engine
2013-08-14 23:43:43 +00:00
e0d5a9b2e0
Merge pull request #1537 from metalivedev/1517-sudodocker
...
Fix #1517 , #1521 by adding sudo to examples and installation.
Upstream-commit: 72660a1a2f8a51fbfb8ccb283f110d84ed1b9939
Component: engine
2013-08-14 16:34:00 -07:00
fd36c14020
Fix #1517 , #1521 by adding sudo to examples and installation.
...
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
36aa33727b
Merge pull request #1538 from KSid/bash-completion-limit-containers
...
Bash Completion: Limit commands to containers of a relevant state
Upstream-commit: 9708597b0b1b5d7bccf26e038091215e82b3edfe
Component: engine
2013-08-14 16:16:25 -07:00
951194f6f0
Merge pull request #1505 from dotcloud/improve_events
...
Add image name in /events
Upstream-commit: 15bc2240ac56a3f584bdc33865c896bac961c6a3
Component: engine
2013-08-14 15:40:36 -07:00
9147a2b4d7
Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes
...
* Runtime: Apply volumes-from before creating volumes
Upstream-commit: 631c4491838e982697f596518f588fda5f9ae73d
Component: engine
2013-08-14 15:10:41 -07:00
390a4fe630
Merge pull request #1249 from unclejack/507-add_sigterm_sigint_handling_to_docker_run
...
#507 - make docker run handle SIGINT/SIGTERM
Upstream-commit: 84a0274885276e33921b378df79819c5f2108f67
Component: engine
2013-08-14 15:00:19 -07:00
9457b97e76
Merge pull request #1541 from dotcloud/1528-fix_panic
...
prevent crash when .dockercfg not readable
Upstream-commit: 5ad884002410ac94a8f4e36782580e7ad2f111fd
Component: engine
2013-08-14 14:51:01 -07:00
59b6e4bc04
Merge pull request #1543 from dotcloud/fix_rmi_parse_repo_tag
...
add missing ParseRepositoryTag
Upstream-commit: 8dfc47307d4d26f8c518de6746d5da96dab27c9b
Component: engine
2013-08-14 14:42:41 -07:00
b264e1d047
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: aae04def7bc9b9d7167a3fe107cf5ea5746f5a87
Component: engine
2013-08-14 23:32:56 +02:00
61c5072463
Merge pull request #1546 from dotcloud/1542-coverage-dependencies
...
testing, issue #1542 : Add docker dependencies coverage testing into docker-ci
Upstream-commit: f51eb0e4b3481fc210d91ed9a91449249f82058c
Component: engine
2013-08-14 14:32:15 -07:00
7509b38aa2
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 8b6b187a8d205e81f50a3bfd114f1b33b985747b
Component: engine
2013-08-14 23:31:58 +02:00
ac3e60cfb0
brew: docker-py requirement points to git repository
...
Upstream-commit: 8b26e4ea3c92748a96b90fa245ccce7c7eebb81c
Component: engine
2013-08-14 23:31:18 +02:00
b9d5c15d6d
testing, issue #1542 : Add docker dependencies coverage testing into docker-ci
...
Upstream-commit: 1d8562b290d636c61aba13e8148963210c5f89aa
Component: engine
2013-08-14 14:27:46 -07:00
9defd8d614
Merge pull request #1478 from jpetazzo/929-insecure-flag
...
add -privileged flag and relevant tests, docs, and examples
Upstream-commit: 9662f9e56adeb92d3749c12bc1ce08928bbfc54b
Component: engine
2013-08-14 13:55:18 -07:00
7aa32c3271
Merge pull request #1509 from dotcloud/1359-tar-pkg-ref
...
Add import for dotcloud/tar to replace std tar pkg
Upstream-commit: 25d71fb01b1ffce2e6704e0c9c1bb2c80ca6053f
Component: engine
2013-08-14 11:26:49 -07:00
b1df86a40c
Merge pull request #1519 from shin-/brew-more
...
Docker-brew 0.5.2 support and memory footprint reduction
Upstream-commit: 12ffb522a6efa7f25d6b2dedb04a00440ec5ed23
Component: engine
2013-08-14 10:40:05 -07:00
604c613243
Merge pull request #1539 from fkautz/https-install-script
...
Install script should be fetched over https, not http.
Upstream-commit: 0077678844f8f0f2e4a409eb71d845d83ca7490e
Component: engine
2013-08-14 10:32:29 -07:00
b9204a988c
Merge pull request #1545 from dotcloud/1544-docker-ci-dependencies
...
testing, issue #1544 : Add new docker dependencies into docker-ci
Upstream-commit: 53f2c5d6e896bd50d358896f009cb7a1c2e7f221
Component: engine
2013-08-14 10:23:08 -07:00
d0c175d770
testing, issue #1544 : Add new docker dependencies into docker-ci
...
Upstream-commit: 49597f0f52d824967779ce26e720a5f3bab54d3e
Component: engine
2013-08-14 10:12:08 -07:00
f090475575
add missing ParseRepositoryTag
...
Upstream-commit: c84d74df8c17f50c8ca7f5027ade4db8360f5ed3
Component: engine
2013-08-14 16:59:21 +00:00
58b5c00cf9
prevent crash when .dockercfg not readable
...
Upstream-commit: 3c9f9945c949e981a4c09da915ea28356b2c58ae
Component: engine
2013-08-14 10:26:18 +00:00
820993826c
Install script should be fetched over https, not http.
...
Upstream-commit: 80ebff0fa49b7813205102431633baba789685fb
Component: engine
2013-08-13 22:28:41 -07:00
eee3eae225
brew: Fixed a bug with remote repository builds
...
Upstream-commit: 62c0f433fa794092fe2a795784f36fbac7b9feec
Component: engine
2013-08-14 05:05:44 +02:00
4d2fe13727
Limit commands to containers of a relevant state
...
Upstream-commit: 44eb1b3892cdcf3bda6478119d90cb69eafbc481
Component: engine
2013-08-14 02:45:03 +01:00
05ba2d91be
Merge pull request #1533 from dhrp/docs-ux-changes
...
Docs ux changes
Upstream-commit: 4cb57a54389e25a3803dc6c4603e330b362c4ee9
Component: engine
2013-08-13 18:03:49 -07:00
613b070b88
Merge pull request #1523 from dotcloud/docker-group-docs
...
Update docs for docker group
Upstream-commit: 2e5642452b23e6c81b0ec29f10e9e1b2de615597
Component: engine
2013-08-13 18:02:30 -07:00
ab351b68de
Merged 0.5.3 hotfix release back to master
...
Conflicts:
api.go
commands.go
network.go
Upstream-commit: 4947e32acb46051297a886c8cd2ff92a05283ab5
Component: engine
2013-08-13 23:47:29 +00:00
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
43b59cff4b
add -insecure flag and relevant tests
...
Upstream-commit: 280901e5fbd0c2dabd14d7a9b69a073f6e8f87e4
Component: engine
2013-08-13 16:20:22 -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
