f16ec54fce
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: c24c5c3b6004edd31c1fd503125b1ba150c2e23a
Component: engine
2013-09-10 10:57:33 -07:00
c0f4a2ef7d
add Brian Olsen to AUTHORS
...
Upstream-commit: b7826f56664c85e44207ce5e1e685ed04016feb6
Component: engine
2013-09-10 16:55:27 +00:00
62ef8f176e
Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content
...
Upstream-commit: 27ca0c225aebfe93c4edd2d39d188175f4b2f516
Component: engine
2013-09-10 16:52:46 +00:00
0d8ea16762
Merge pull request #1759 from bdon/graph-map
...
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
2013-09-10 08:49:11 -07:00
8ec924d460
Merge pull request #1735 from dotcloud/1301-support-domainname
...
Add domain name support
Upstream-commit: e89396809fc3cc9a52e7787f829a8b96c7cee4a4
Component: engine
2013-09-09 17:21:11 -07:00
108dc7f51c
Merge pull request #1796 from shin-/api_1_5
...
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information
Upstream-commit: 2801624462a4b3842930d38b09a5039629d1a5d3
Component: engine
2013-09-09 16:58:54 -07:00
9a252c6ee5
Merge pull request #1793 from reds/master
...
From FIXME: local path for ADD
Upstream-commit: 58281b4f18b01b06f49e9ca90e39c918bfc3275b
Component: engine
2013-09-09 16:14:59 -07:00
a719a21e63
add Martin Redmond to AUTHORS
...
Upstream-commit: dd806b4ecd2c94356342da720e580ab13288df33
Component: engine
2013-09-09 22:19:28 +00:00
bddbd1b5d0
Merge branch 'filter' of https://github.com/reds/docker into reds-filter
...
Upstream-commit: 843f9091f25eee67a8c858ddf9b61d630b17a11d
Component: engine
2013-09-09 22:16:16 +00:00
14a282bed0
Merge pull request #1837 from dotcloud/fix-tests-1812
...
only os.Exits on error
Upstream-commit: 53da0507e456b11dc9b98c304038c1e56df66530
Component: engine
2013-09-09 15:12:32 -07:00
2d20e5611c
rebase master
...
Upstream-commit: bd847f66c635380096b19c41c4a3536dff4199e1
Component: engine
2013-09-09 22:11:53 +00:00
7f77532ae1
Merge pull request #1825 from dotcloud/merge-builder-runtime
...
Refactor to merge builder.go into runtime.go
Upstream-commit: e503f6a87802d388cc8c9829c4f1eacbab1a13a6
Component: engine
2013-09-09 15:11:41 -07:00
f14e5c017d
Merge pull request #1828 from mmikulicic/patch-1
...
Please add go-dockerclient to docker API clients doc
Upstream-commit: 8ddfb4d6aa43de31e2043fd86dcefb0ed4f591b0
Component: engine
2013-09-09 14:51:28 -07:00
94007cc5e6
remove docker-ruby from docs
...
we don't maintain it anymore as we now recommend proper HTTP api based clients instead.
Upstream-commit: 3c90e96b6d9e16b3983cd7e387b06e81130f1e7c
Component: engine
2013-09-09 14:42:45 -07:00
fb9071f221
only os.Exits on error
...
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
2013-09-09 21:26:35 +00:00
887e5a84ef
Merge pull request #1812 from dotcloud/return-run-exit-code
...
*Client: Return the process exit code for run commands
Upstream-commit: 9b088ada7e1f7bf9021d6c319550ff11be1b0a22
Component: engine
2013-09-09 14:10:46 -07:00
9cb316385e
Merge pull request #1773 from hectcastro/hc-riak-example
...
Add a Docker example for running Riak
Upstream-commit: 0508bd8da78af21fef74cb45993f60f188eeac39
Component: engine
2013-09-09 13:31:41 -07:00
23416421ac
fix init layer
...
Upstream-commit: 446ca4b57b228a2d030f0c816e08948ff7da1d79
Component: engine
2013-09-09 20:29:57 +00:00
8ab45c6770
bind mount /etc/hosts and /etc/hostname
...
Upstream-commit: 4f2e59f94a771c4b60947726815d065ef0ea253a
Component: engine
2013-09-09 20:29:57 +00:00
b8740215e5
add domainname support
...
Upstream-commit: 0a436e03b8289510ad191a89fcbd5ec06fb8865d
Component: engine
2013-09-09 20:29:06 +00:00
bdd7f084cd
Merge pull request #1807 from tianon/gentoo-docs
...
Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker
Upstream-commit: c66a827c98027ce5e3b4ebe83f8b2143e2a62d8b
Component: engine
2013-09-09 13:27:48 -07:00
3b3fbee916
Push tags to registry even if images are already uploaded
...
Upstream-commit: 64bc08f1c4bee42ff5a17b2d6ababb288fd8f209
Component: engine
2013-09-09 21:02:37 +02:00
fe18d490b4
note about exiting from attachment prior to running
...
Upstream-commit: 9749d94fb0f3034247dbd969f6dad390f2605e1a
Component: engine
2013-09-09 10:30:06 -04:00
04edea7666
improve sentence readabilty
...
Upstream-commit: 630ae43e7d11fa34421a253c765edb6cef5a3371
Component: engine
2013-09-09 10:19:45 -04:00
6d96bcd64c
Please add go-dockerclient to docker API clients doc
...
Upstream-commit: 268928ab35a5402ff37413ab258200c4bed48790
Component: engine
2013-09-09 11:01:15 +01:00
f75afeebe3
Add missing package import
...
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
2013-09-07 17:03:40 -07:00
7985dd19d1
Add missing comments to runtime.go
...
Upstream-commit: 6a9f4ecf9bc4263baef8e9a1d86f1474f9c66d31
Component: engine
2013-09-06 17:43:34 -07:00
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
eed5427302
Remove import os/user
...
Upstream-commit: b07314e2e066a1308040e1eb45a96a0e1056f28a
Component: engine
2013-09-06 23:00:21 +00:00
14c14520dc
README: remove original shipping containers 'manifesto'. It's a little long to stay here.
...
Upstream-commit: eed00a4afd1e8e8e35f8ca640c94d9c9e9babaf7
Component: engine
2013-09-06 15:09:40 -07:00
6a1261fd84
README: replace 'install instructions' and 'usage examples' with references to the website and docs
...
Upstream-commit: 6679f3b053344e6e99d5e490720c9ccb924a7d4c
Component: engine
2013-09-06 15:09:04 -07:00
8e77b3527e
README: harmonize intro with website
...
Upstream-commit: 70ab25a5dbc8f54dbe15e9375687b4669ed919df
Component: engine
2013-09-06 15:08:01 -07:00
c1a63c6958
README: refer to the docs for install instructions to remove duplication.
...
Upstream-commit: bcb8d3fd86ac620dc4f35c805b4e0f8e8fcb7663
Component: engine
2013-09-06 14:52:14 -07:00
490341864a
Update roadmap
...
Upstream-commit: b9ca311008a14910877c6283b1dc7fb4a14bef4c
Component: engine
2013-09-06 14:48:06 -07:00
796b8f393b
Add Swiftype search to docs
...
Upstream-commit: 03a28da5f78bd0f20eca3390a2dddca4ccb6ca81
Component: engine
2013-09-06 13:34:24 -07:00
99856a0342
filter image listing using path.Match
...
Upstream-commit: b44d11312054d1d7bc0f0bbc8eeaddc2d30c26cc
Component: engine
2013-09-06 16:16:10 -04:00
b385774680
improve image listing
...
Upstream-commit: 35bcba80116668864380319d9b6fe0249cefd114
Component: engine
2013-09-06 15:51:49 -04:00
df765d9499
Merge pull request #1777 from dotcloud/1620-index-test
...
testing, issue #1620 : Add index functional test on docker-ci
Upstream-commit: f2bc7ebf1ed7d907a2354a760a1eeccd5b65a668
Component: engine
2013-09-06 09:21:05 -07:00
c9f3b3971f
Merge pull request #1780 from shin-/1218-push-dependencies
...
Respect dependency graph when pushing a repository
Upstream-commit: 8a2fd914b2680de0ce246950c3fc46b5359da907
Component: engine
2013-09-05 17:32:45 -07:00
7453a21af1
Merge pull request #1810 from dotcloud/1798-inspect-fix
...
Detect images/containers conflicts in docker inspect
Upstream-commit: f3d51bb3d574b73c3bea7538310f3c8052ea13cb
Component: engine
2013-09-05 17:17:09 -07:00
73b7802f1f
From FIXME: local path for ADD
...
Upstream-commit: 8374dac02141c1409b93bb3838f6dabbba4d5b14
Component: engine
2013-09-05 20:05:36 -04:00
d2ed0c7fa0
Return the process exit code for run commands
...
Upstream-commit: 3bc73fa21e4428cd7040df6c5a384bd0e4772236
Component: engine
2013-09-05 23:54:03 +00:00
33af815c03
remove unused getCache endpoint
...
Upstream-commit: 0d7044955a4b63c4df2a611095b87ae417a3cf9b
Component: engine
2013-09-05 23:00:52 +00:00
e7babc83eb
fix indent in doc
...
Upstream-commit: 20a763e51934f3b52e48b5a6ba37d63852fd9a0b
Component: engine
2013-09-05 22:33:04 +00:00
e904047138
Detect images/containers conflicts in docker inspect
...
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
2013-09-05 22:31:17 +00:00
236805a6b0
Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
...
testing, issue #1802 : Temporarily skip TestGetContainersTop
Upstream-commit: 908bb65dcf7f8a2d5e04de862e3908b46529d6a1
Component: engine
2013-09-05 14:44:47 -07:00
cab30800ec
Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting
...
Upstream-commit: d368c2dee99b35830392938a783137f344e5b89a
Component: engine
2013-09-05 13:36:56 -06:00
5d9b381364
Reformat Gentoo install instructions to 80 columns
...
Upstream-commit: 82dd417ef6966b0f3d812122c18420feb64f49a7
Component: engine
2013-09-05 13:36:16 -06:00
3306a42bfc
Merge pull request #1804 from Bouke/patch-1
...
Fix memory recommendations (Byte, not bit)
Upstream-commit: b57d7dca9de306d9372dfde6cd736aef1c4416e1
Component: engine
2013-09-05 11:52:00 -07:00
85199fa5e3
Merge pull request #1772 from dotcloud/update-tar-revision
...
Update tar pkg revision number
Upstream-commit: 8e411815915d706f69ea344ba142cb96c89650ff
Component: engine
2013-09-05 10:32:53 -07:00
