Commit Graph

3326 Commits

Author SHA1 Message Date
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
122c44caef Created a little landing page for the examples, combined first two.
Upstream-commit: fe99e51634f7068ce997e9866516f2b14a93bda9
Component: engine
2013-09-09 13:19:07 -07:00
ad4c847399 Merge pull request #1833 from shin-/1815-always-push-tags
Push tags to registry even if images are already uploaded
Upstream-commit: 49b5c44ee93f8d531400a24606d90a944e42a73c
Component: engine
2013-09-09 13:10:40 -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
79e1a652fc Merge pull request #1831 from brianshumate/jbs-docs-edits
Hello World Daemon edits
Upstream-commit: 2d4ac06426454df87fc85f0cbb7d8a6553f052eb
Component: engine
2013-09-09 11:48:12 -07: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
774dff2935 Hack: we no longer need to generate test binaries.
Upstream-commit: 4cd59b96ed93d8a4c35099a0a1171e17170071ab
Component: engine
2013-09-08 18:45:23 -07:00
3184ad242c vendor.sh can cleanly update vendored dependencies
Upstream-commit: 055bbb79c10a829e054d6741d1937f0304dbb7fd
Component: engine
2013-09-07 17:48:52 -07:00
911d6019d5 gitignore: ignore bundles directory
Upstream-commit: 19dc3b0792272c2f0fbcfb654349fe5e86bc8046
Component: engine
2013-09-07 17:35:49 -07:00
9327ca0955 move deps installation to vendor.sh script
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
2013-09-07 17:35:48 -07:00
f75afeebe3 Add missing package import
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
2013-09-07 17:03:40 -07:00
970480b8f8 Document using the Dockerfile for interactive dev/test cycles
Upstream-commit: d757bd0904b71346b6c83622ae5685bc0c0d4349
Component: engine
2013-09-06 20:16:13 -07:00
742fb66041 Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.
Upstream-commit: 47838051be695a4e74c80690ceef811dcd3ef62c
Component: engine
2013-09-06 20:14:03 -07:00
4d40f8afe3 Add usage instructions to the Dockerfile. Build, test and release docker using docker.
Upstream-commit: fa806f26aff927eb0d98b41e79786ae98987da5b
Component: engine
2013-09-06 19:58:05 -07:00
c090718b10 Adapt Dockerfile to run docker tests inside docker
Upstream-commit: 34eab428330ce4a56c22b03f3067dd8eeee7ed41
Component: engine
2013-09-06 19:27:49 -07:00
ae4d5c759f Adapt the original dind script and add a description
Upstream-commit: 3c80bd76cf6aa8f6918439f8082b0a8c34fd2c0e
Component: engine
2013-09-06 19:27:48 -07:00
c7b1568901 Copy dind wrapper script from github.com/jpetazzo/dind
Upstream-commit: c983023661deac0713eaa218c6bdfd20ec5eee45
Component: engine
2013-09-06 19:27:48 -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
020dee6d7f Merge pull request #1822 from dotcloud/remove_os_user
Remove os user
Upstream-commit: c8f885a4d048e5adaa485e674999d79fb2d717db
Component: engine
2013-09-06 16:30:54 -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
153463d6e1 Merge pull request #1818 from metalivedev/655-searchswiftype
Add Swiftype search to docs
Upstream-commit: 37186d9ef40b31730940409a7acb21e02688b707
Component: engine
2013-09-06 13:46:50 -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
9d62bab207 Merge pull request #1811 from dotcloud/672-remove_getcache
Remove unused getCache endpoint
Upstream-commit: d06a0ba1a7ef3a018be1aef951733b85798c42b9
Component: engine
2013-09-05 17:07:49 -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