fec117a06eClean up quoting, wraps, and build error on code-block. Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938 Component: engine
Andy Rothfusz
2013-12-05 17:16:31 -08:00
41a5e644a5Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84 Component: engine
Andy Rothfusz
2013-12-05 17:03:26 -08:00
b525e44e89Bump to 0.7.1 Upstream-commit: e39d35dedad1db952c30958303902b4c96e1f406 Component: engine
Guillaume J. Charmes
2013-12-05 16:32:02 -08:00
90d525a632Merge branch 'master' into release
Guillaume J. Charmes
2013-12-05 16:40:24 -08:00
522f629592Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
Guillaume J. Charmes
2013-12-05 16:41:43 -08:00
bd4e7f6cb9Merge pull request #3006 from tianon/ubuntu-cgroup-bin
Victor Vieux
2013-12-05 16:41:01 -08:00
f3927b33a8Merge pull request #2955 from crosbymichael/search-name-first
Victor Vieux
2013-12-05 16:16:55 -08:00
dd568b3dd1Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
Andy Rothfusz
2013-12-05 15:27:36 -08:00
8a00a3de0bMerge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
Andy Rothfusz
2013-12-05 15:25:09 -08:00
738aed6186If container does not exist try to remove the name and continue Upstream-commit: 7bf3a07371bb0baed21b59d60835ed2f4877b571 Component: engine
Michael Crosby
2013-12-05 15:22:21 -08:00
c8f60ad629Merge pull request #3061 from shykes/sven-doc-maintainers
Andy Rothfusz
2013-12-05 15:17:34 -08:00
b5ccf77471Merge pull request #3075 from dotcloud/pull_layers
Guillaume J. Charmes
2013-12-05 14:47:39 -08:00
1181340954wait on pull from another client Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf Component: engine
Victor Vieux
2013-12-05 14:41:56 -08:00
322ee3f0e8refs #2490 : add a network page to docs Upstream-commit: eac95671f50a65279f8c39341c4f3be680add98a Component: engine
Pierre-Alain RIVIERE
2013-12-05 19:02:19 +01:00
f74efb9865Merge pull request #2992 from jpoimboe/bridge-create-ioctl
Michael Crosby
2013-12-05 14:40:03 -08:00
f9d6ff33eeinclude Red Hat Enterprise, should have part of #3011
Andy Rothfusz
2013-12-05 14:34:10 -08:00
89905dc61dMerge pull request #3011 from goldmann/rhel_instructions
Andy Rothfusz
2013-12-05 14:30:31 -08:00
8592a6729aMerge pull request #3034 from rogaha/fix_doc_registry_index_spec
Andy Rothfusz
2013-12-05 14:24:13 -08:00
629f490217Merge pull request #3074 from crosbymichael/dm-history-calc
Guillaume J. Charmes
2013-12-05 14:13:03 -08:00
18b9488ee1Save layersize on pull
Michael Crosby
2013-12-05 14:03:23 -08:00
754f4c422fMerge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
Andy Rothfusz
2013-12-05 14:00:53 -08:00
7dfca4d041Merge pull request #3057 from crosbymichael/test-cpu-share
Guillaume J. Charmes
2013-12-05 13:58:01 -08:00
dccee4fb11create the bridge device with ioctl
Josh Poimboeuf
2013-12-02 11:03:21 -06:00
d47883ca6ayum upgrade on fedora not required before install
Lokesh Mandvekar
2013-12-05 14:21:03 -06:00
3f0ab3c931use mattdm/fedora in fedora doc and other cosmetic changes
Lokesh Mandvekar
2013-12-05 14:03:17 -06:00
8ece76c065Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process
Guillaume J. Charmes
2013-12-05 11:28:30 -08:00
f81857be89Merge pull request #3024 from jamtur01/ubunturepo
Guillaume J. Charmes
2013-12-05 11:27:46 -08:00
370b2a74f3Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
Andy Rothfusz
2013-12-05 11:01:27 -08:00
c6803b7bf2Fixed#2136 - Added styles
James Turnbull
2013-12-03 17:48:19 -05:00
655f0f72faMerge pull request #3060 from dotcloud/sd_notify
Guillaume J. Charmes
2013-12-05 10:33:29 -08:00
20fd83bd52add docs for the new json format Upstream-commit: f95f2789f274f3d98ea77cd6c10b899aa3db2dc6 Component: engine
Victor Vieux
2013-12-02 13:55:31 -08:00
f1ec7415d1Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
Victor Vieux
2013-12-05 10:02:57 -08:00
94326d728bdocs/installation/google: add enabling Google Compute Engine step Upstream-commit: 5a17c208cd4858a21d38b09e60ee8199880f02bb Component: engine
Johan Euphrosine
2013-12-05 09:43:08 -08:00
9a46759761use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes Upstream-commit: e9bf971e69800f1189dd240d95972f5f0dcc3bec Component: engine
Sven Dowideit
2013-12-05 21:48:35 +10:00
534fc04e4e- Added link to the source code repo on github Upstream-commit: 909da5d5249880b02bad5fb893d12fe2a3fdd942 Component: engine
Roberto Gandolfo Hashioka
2013-12-04 21:08:44 -08:00
8519def9b4add a little prose to tell the user that run creates a container, and then starts it Upstream-commit: 04c32495f69a48c34b753b66d7cdc4f2c695f405 Component: engine
Sven Dowideit
2013-12-05 14:19:10 +10:00
53cfdbe273I 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
Sven Dowideit
2013-12-05 14:14:08 +10:00
25e3f85d24Merge pull request #2991 from fortybillion/patch-1
Andy Rothfusz
2013-12-04 18:32:19 -08:00
e5d73f33fcMerge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
Andy Rothfusz
2013-12-04 18:25:58 -08:00
e0c7cf69e6Merge pull request #2907 from goldmann/iptables-fix
Victor Vieux
2013-12-04 18:04:57 -08:00
3f773fbd23Merge pull request #2966 from andrewsmedina/govet2
Victor Vieux
2013-12-04 17:57:10 -08:00
6e5bbd93f0Add Sven Dowideit to docs maintainers Upstream-commit: b4e21ad1da616ab46669401dc7d62a6e19b05619 Component: engine
Solomon Hykes
2013-12-04 17:50:33 -08:00
9684769cb6sd_notify ready status when accepting API requests Upstream-commit: 97088ebef7c638f8175d7c61934642eeb2c054c4 Component: engine
Victor Vieux
2013-12-04 17:44:08 -08:00
8eac8d89dbremove unused parameter in Download Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832 Component: engine
Victor Vieux
2013-12-04 11:54:11 -08:00
f9faf9ad5dMerge pull request #2796 from EmilHernvall/master
Victor Vieux
2013-12-04 11:15:51 -08:00
f2f4f227e1Merge pull request #2790 from proppy/fix-tar
Michael Crosby
2013-12-04 11:06:13 -08:00
6e7481e8eeMerge pull request #3018 from pnasrat/3017-debug-expvar
Michael Crosby
2013-12-04 10:53:35 -08:00
dce2c8c9b7Merge pull request #2946 from dhrp/doc-postgres-typo
Andy Rothfusz
2013-12-04 10:51:02 -08:00
55c7790d1cMerge pull request #3000 from creack/improve_make_sh_test
Michael Crosby
2013-12-04 10:41:55 -08:00
06ae34a0b2Merge pull request #3029 from pnasrat/container-refactoring
Michael Crosby
2013-12-04 10:35:42 -08:00
c4093ec706initial stab at writing a use/ambassador-pattern howto (Issue #2485) Upstream-commit: 6ddea783ef8067b0c739785b6afd10d58255b4c9 Component: engine
Sven Dowideit
2013-12-04 16:47:45 +10:00
b230abcf63- Updated the doc with the current implementation status Upstream-commit: 58c33360b01748f4900dd00dc57c3aec89a98e27 Component: engine
Roberto Gandolfo Hashioka
2013-12-03 16:39:23 -08:00
e21c443f19Extract volume bind, creation and external methods.
Paul Nasrat
2013-12-03 17:47:49 -05:00
0171e1cc75Merge pull request #2339 from shin-/private_reg_auth
Sam Alba
2013-12-03 15:29:38 -08:00
7da5754161Merge pull request #2930 from creack/docker-osx
Victor Vieux
2013-12-03 15:27:21 -08:00
b4dda37afdAdded myself to docs MAINTAINERS Upstream-commit: 0132547a385697f3fee1e6bf9fe3fa07c98f3fd0 Component: engine
James Turnbull
2013-12-03 17:51:34 -05:00
0c7bc6f2ceExtract helper method for volume linking.
Paul Nasrat
2013-12-03 17:35:54 -05:00
9d4980d1a7Merge pull request #2999 from dotcloud/improve_progress_bars
Victor Vieux
2013-12-03 14:24:40 -08:00
71ac3b3d2aHandle small screens Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb Component: engine
Victor Vieux
2013-12-02 11:53:04 -08:00
8fd397a50cUpdated Fedora docs
James Turnbull
2013-11-25 22:14:33 -05:00
b151598031Merge pull request #3009 from silas/stream-logs
Victor Vieux
2013-12-03 13:43:35 -08:00
1f27c8a370Added note about Ubuntu curl installation Upstream-commit: 64439505c7801214d4e01941c2e92d64261ab137 Component: engine
James Turnbull
2013-12-03 14:17:59 -05:00
aea480f046Add docs for hostconfig in inspect Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff Component: engine
Michael Crosby
2013-12-02 18:17:15 -08:00
75c6e1df8fMerge pull request #3022 from pnasrat/3021-makefile-testflags
Michael Crosby
2013-12-03 10:55:22 -08:00
dadb586d63Expose expvar endpoint during debugging.
Paul Nasrat
2013-12-03 13:04:18 -05:00
7e8e4fe649Ensure that the init layer is removed with the container Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60 Component: engine
Michael Crosby
2013-12-03 09:20:14 -08:00
055cf4f6b6Add a proposal step for potential MAINTAINERS.
Paul Nasrat
2013-12-03 10:53:18 -05:00
27db2d038bHandle 401 response in auth.Login() for authed private registries Upstream-commit: 9be5db8704be5bda02484c374f4bd9b197d5701b Component: engine
shin-
2013-11-07 19:36:02 +01:00
3959a8a4bcDon't return req as result of setTokenAuth Upstream-commit: 3f921639894d3eca72c9ae105d3ad4f386651caa Component: engine
shin-
2013-11-04 21:49:34 +01:00
14f5d29204missed one call to setTokenAuth Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a Component: engine
shin-
2013-10-23 18:00:40 +02:00
37888fa7b4Use basic auth for private registries when over HTTPS. RequestFactory is no longer a singleton (can be different for different instances of Registry) Registry now has an indexEndpoint member Registry methods that needed the indexEndpoint parameter no longer do so Registry methods will only use token auth where applicable if basic auth is not enabled. Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766 Component: engine
shin-
2013-10-22 20:49:13 +02:00