Alexander Boyd
50bc44d6da
Correct inaccuracy in docker pull documentation
...
Signed-off-by: Alexander Boyd <alex@opengroove.org >
Upstream-commit: eb8e84c48a8a20895b78299dbc2d8429d092be8d
Component: engine
2014-11-29 23:36:19 -07:00
James Turnbull
b86446758b
Merge pull request #9332 from jacobat/patch-1
...
Update documentation for EXPOSE
Upstream-commit: 353ff40181276a0278b323e569cc887d0510ae69
Component: engine
2014-11-29 09:27:49 -05:00
Jacob Atzen and Jacob Atzen
af8a86ae0c
Update documentation for EXPOSE
...
The documentation for EXPOSE seems to indicate, that EXPOSE is only relevant in
the context of links, which is not the case.
Signed-off-by: Jacob Atzen <jatzen@gmail.com >
Upstream-commit: 8432224f0ef628b3da42def046e48f9635aa4b23
Component: engine
2014-11-29 15:18:18 +01:00
Fred Lifton
ce7b0568fe
Merge pull request #9227 from SvenDowideit/add-client-ip-to-hosts
...
Add an example of how to add your client IP to the container hosts file
Upstream-commit: 2c97cc39958ab9e4d1432836a9e925dd03e87fad
Component: engine
2014-11-28 17:44:11 -08:00
Sven Dowideit and Sven Dowideit
bb2a1e68cf
Add an example of how to add your client IP to the container hosts file
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 54050083d1c65d4e7a90371c78c587819df27d2f
Component: engine
2014-11-27 16:36:55 +10:00
James Turnbull
ceb1c8dfdb
Merge pull request #9368 from msteinert/builder-md-typo
...
Fix a small typo
Upstream-commit: 9e56c614a160957fa7cd2da91b45780bb3dbaf45
Component: engine
2014-11-26 22:39:19 -05:00
Sven Dowideit and Sven Dowideit
1d30429df6
Explain what the VIRTUAL SIZE means
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 498f208ade18dffb7362adc37c1f11b1bff187da
Component: engine
2014-11-27 12:06:40 +10:00
Michael Steinert
b9f89e5866
Fix a small typo
...
Signed-off-by: Michael Steinert <mike.steinert@gmail.com >
Upstream-commit: 8b881df9b1f3c8fa7c36dd5b2fb3e7235f6d4654
Component: engine
2014-11-26 13:09:44 -06:00
Jessie Frazelle
3253386751
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
2014-11-25 18:03:51 -08:00
Jessie Frazelle
039ddfff8b
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
2014-11-25 17:52:27 -08:00
Doug Davis
c28ef478d3
Add support for docker exec to return cmd exitStatus
...
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.
Closes #8703
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
2014-11-25 17:49:25 -08:00
Michael Crosby
d74ab85d73
Merge pull request #9162 from aidanhs/patch-1
...
Allow git@ urls for more than just github
Upstream-commit: df7c22dd2307cb530b300a84ae9ddcc951dc3e47
Component: engine
2014-11-24 14:51:52 -08:00
Jessie Frazelle
d700b94cc1
Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api
...
Cleanup exec API docs and available params
Upstream-commit: 39284be960d3d528ecf3faaa7900f4718e959c06
Component: engine
2014-11-24 13:35:45 -08:00
Aidan Hobson Sayers
85fb88371f
Allow git@ prefixes for any hosted git service
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: c7e4cc4a531b5337d64bda22df8553e646a96fe7
Component: engine
2014-11-24 20:49:54 +00:00
Michael Crosby
4704f56d5d
Merge pull request #9301 from krivenok/master
...
Fixed typo in documentation.
Upstream-commit: b4757445ae5dd4de63d793d2c54232d5254b7a9c
Component: engine
2014-11-24 12:27:56 -08:00
Michael Crosby
b6f3cebe53
Merge pull request #9281 from unclejack/build_pull_flag
...
build: add pull flag to force image pulling
Upstream-commit: 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Component: engine
2014-11-24 12:10:45 -08:00
Dmitry V. Krivenok
bb8eca9ba7
Made wording a bit more generic.
...
Upstream-commit: 5deedef42c7d85835729ecf4fe61ec91612089af
Component: engine
2014-11-24 21:22:54 +03:00
Richard Metzler
ea8fa13170
Empty Line should fix Markdown unordered list
...
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok
9509d05af6
Fixed typo in documentation.
...
Upstream-commit: 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Component: engine
2014-11-23 22:59:35 +03:00
Jessie Frazelle
8bf9a8d42c
Merge pull request #9223 from vbatts/vbatts-overlay_notfound
...
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
2014-11-21 19:58:01 -08:00
Brian Goff
1f85619ac6
Cleanup exec API docs and available params
...
Adds pertitent information about what is expected in the json payload
and comments out unsupported (exec) features in runConfig.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
2014-11-21 21:11:07 -05:00
Michael Crosby
21eb3ab253
Merge pull request #9265 from vieux/daemon_labels
...
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
2014-11-21 15:14:27 -08:00
Sven Dowideit
50546730f2
Merge pull request #9209 from SvenDowideit/shared-disk-space-images
...
If an image has more than one repo name or tag, it'll be listed more tha...
Upstream-commit: 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Component: engine
2014-11-21 14:07:45 -08:00
Victor Vieux
eec853d8c5
key=values -> key=value
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 62a7d75512d939a86cbc58986278548df3302902
Component: engine
2014-11-21 19:15:22 +00:00
unclejack
19f9fcbc25
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
2014-11-21 19:59:44 +02:00
Michael Crosby
b4f3f7d0fc
Merge pull request #9259 from duglin/Issue9221
...
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
2014-11-20 17:41:31 -08:00
Doug Davis
f7e2fcdfb9
Make --tlsverify enable tls regardless of value specified
...
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.
Per #9221 - also tweaked the docs to fix a typo.
Closes #9221
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
2014-11-20 16:09:06 -08:00
Fred Lifton
ed1ade4c80
Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
...
Add an example that shows starting apache in the foreground
Upstream-commit: 29f4ea2cd5ee0988abb24264e4dbf01fa52d2d54
Component: engine
2014-11-20 16:02:38 -08:00
Michael Crosby
271208f1aa
Merge pull request #9228 from SvenDowideit/update-tlsverify-doc
...
tlsverify flag has no dash
Upstream-commit: c1a40d927999a7e019f1952c2b140ef6e4a76171
Component: engine
2014-11-20 15:19:31 -08:00
Sven Dowideit
17282d5feb
Add an example that shows starting apache in the foreground
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 8d3b13bd7a14aa41eb3d3f3aab1b974af1db4a50
Component: engine
2014-11-20 14:21:05 -08:00
Michael Crosby
f435c304cd
Merge pull request #8251 from duglin/Issue2333
...
Add support for ENV of the form: ENV name=value ...
Upstream-commit: 58b6f31a7a3157b5ece418da0a976a28dae9841d
Component: engine
2014-11-20 13:12:24 -08:00
Victor Vieux
a8399407af
docs nits
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 284cbda9ceb368d4bb67c0c75739984622570d92
Component: engine
2014-11-20 19:54:03 +00:00
Victor Vieux
f6afb58177
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00
Victor Vieux
35fec2c425
add daemon labels
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Component: engine
2014-11-20 19:23:58 +00:00
Tibor Vass
fa056c1bc9
Merge pull request #9201 from vieux/add_hostname_docker_info
...
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
Doug Davis
5dafd01fe8
Add support for ENV of the form: ENV name=value ...
...
still supports the old form: ENV name value
Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \
Closes #2333
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1314e1586f8cd6201c16161eb960a743c727946b
Component: engine
2014-11-20 09:54:28 -08:00
Victor Vieux
7a40da10bf
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8ef36dcfe75752a5705813e2d9fa9359a8162b18
Component: engine
2014-11-20 17:40:08 +00:00
Victor Vieux
addb2d43fa
Hostname -> Name
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
2014-11-20 17:40:08 +00:00
Vincent Batts and Vincent Batts
41c5b5d8f6
overlayfs: add --storage-driver doc
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: cb57c388480d03770378e6e1842c2c1c6a46d8fd
Component: engine
2014-11-19 19:36:05 -05:00
Sven Dowideit
f169786708
Merge pull request #9191 from duglin/Issue8775
...
Be clearer in docs about COPY/ADD dirs
Upstream-commit: 3e5cb0c84f390c2c939061ae34754e3924f82790
Component: engine
2014-11-19 15:26:20 -08:00
Sven Dowideit
e390ce1d8e
Merge pull request #9144 from miminar/sigproxy_tty
...
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
2014-11-19 14:52:01 -08:00
Sven Dowideit
c8b93c2707
If an image has more than one repo name or tag, it'll be listed more than once
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 57b6993c2c99dd89a3cbe012935a82966d88aa92
Component: engine
2014-11-18 18:06:22 -08:00
Sven Dowideit
7973650734
tlsverify flag has no dash
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a0fb8eca30fd97aaa592268b4b6e8ac7737b78ac
Component: engine
2014-11-18 17:42:33 -08:00
James Turnbull
461e426c89
Merge pull request #9219 from acbodine/cleanup-remote-api-docs-start
...
Cleanup: fixes start response status code typo in examples
Upstream-commit: af54dc215f08ef1a56eaef54e8e4cc5e6f7d21a9
Component: engine
2014-11-18 20:25:36 -05:00
Andrew C. Bodine
01eaabb4bf
Cleanup: fixes start response status code typo in examples
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: f9cdad32721808b6beeab544de26cca9ff68e1f0
Component: engine
2014-11-18 11:32:51 -08:00
Doug Davis
9cd25b81c7
Be clearer in docs about COPY/ADD dirs
...
COPY/ADD just copies the contents of dirs, not dirs themselves.
This PR tries to clear that up in the docs.
Closes #8775
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b4346c4810c4801e8885485b2bf0311f1b6d00ec
Component: engine
2014-11-18 04:33:53 -08:00
Sven Dowideit
801f67cf03
Merge pull request #8749 from brahmaroutu/resize_uponstart_8728_2
...
Fix the documentation and integration test for container resize
Upstream-commit: e2d08bd5ead101bdb58868492179f0bbe72547f3
Component: engine
2014-11-17 17:24:58 -08:00
Jessie Frazelle
5d1b12a860
Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer
...
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
2014-11-17 17:42:27 -07:00
Victor Vieux
9554f43a2c
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8545155c41b1ccc22056733539660b1afa6790ef
Component: engine
2014-11-17 19:26:43 +00:00
Srini Brahmaroutu
884eb7da74
Fix the documentation and integration test for container resize
...
Closes #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 91fb9b2f5a07232cecfcde38a98c3ec6410239b7
Component: engine
2014-11-17 18:38:08 +00:00
Alexander Boyd
James Turnbull
Jacob AtzenandJacob Atzen
Fred Lifton
Sven DowideitandSven Dowideit
Michael Steinert
Jessie Frazelle
Doug Davis
Michael Crosby
Aidan Hobson Sayers
Dmitry V. Krivenok
Richard Metzler
Brian Goff
Sven Dowideit
Victor Vieux
unclejack
Tibor Vass
Vincent BattsandVincent Batts
Andrew C. Bodine
Srini Brahmaroutu