146962fdd3
Adding IPv6 network support to docker
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 813ff7f19d6a097f39dae363d8dd81b70eee515a
Component: engine
2015-01-09 00:13:09 +01:00
14432954b7
Merge pull request #9898 from SvenDowideit/document-https-proxy-daemon-setup
...
Add @ArikaChen's tip for using HTTPS proxy to pull
Upstream-commit: b168ef274aa6676d2fa4da071b06def22f3824be
Component: engine
2015-01-08 10:40:02 -08:00
269ee3bcdf
Allow for Dockerfile to be named something else.
...
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00
1802007e16
Merge pull request #9920 from SvenDowideit/publish-all-maps-to-random-ports
...
Explicitly mention that '-P' maps to random ports
Upstream-commit: 0bc2222b3940a8d55c344b9fd03b7934d9d55d6b
Component: engine
2015-01-06 09:39:50 -08:00
f82eddabc6
--help option and help command should print to stdout not stderr
...
--help and help are successful commands so output should not go to error.
QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.
Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.
The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen. For example a error on a
"docker run" command is very difficult to diagnose.
Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: a2b529ead21e6ab9eafcb1b1d2437c725c43a06a
Component: engine
2015-01-06 13:40:14 +01:00
4bf864f7fb
Explicitly mention that '-P' maps to random ports
...
as noted in https://github.com/boot2docker/boot2docker/issues/690
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 7b2331061e428176cf513487745ac496e2bd7027
Component: engine
2015-01-06 17:01:10 +10:00
84bc821f4d
Add @ArikaChen's tip for using HTTPS proxy to pull
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: d1e5078f318f69b24ed47f2bf283903650ced4d9
Component: engine
2015-01-06 15:37:07 +10:00
986d8f11d2
add ability to publish range of ports
...
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2338a9cf5a1ba5576b92e49065335a9c9251ade0
Component: engine
2015-01-02 23:21:26 +00:00
73d7861c36
Merge pull request #9848 from SvenDowideit/add-restart-policy-delay-docs
...
Document that there is a delay before the --restart policy restart, and ...
Upstream-commit: d7f72188ffe3cf98481292d780da463b7de05e58
Component: engine
2014-12-31 12:13:21 -08:00
5ac672fe9b
Talk up the 1.4 change to initialise volumes at time
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 1d4a13867053b58971424f8caf219f935fc66fdd
Component: engine
2014-12-30 13:08:53 +10:00
d5fa05762a
Document that there is a delay before the --restart policy restart, and that its double the last one
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 35873e747d5681e42582f51ea48993382cb893a6
Component: engine
2014-12-30 12:36:04 +10:00
ab25e4ba52
Add "OOM killed" event based on OOM state information
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 44cab4a4ff05cb1e499fba19394aadb20fc887b8
Component: engine
2014-12-23 18:22:31 -05:00
9667f960f7
Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused
...
Update the documentation for #9356 fix
Upstream-commit: f2b89166cf3d352298496ea19a7b72bf5b1cba54
Component: engine
2014-12-17 17:04:25 -08:00
f644595194
Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry
...
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
2014-12-17 16:03:55 -08:00
8f8a34a48e
Additions for 1.4.1 release
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6afe5bf9ede46b81fb63283c55488dbbc50d5a07
Component: engine
2014-12-16 17:40:02 -08:00
7e0c2fb835
Update the documentation for #9356 fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c9ca5c4dd3a90332cc40d25175e3b54aca1212a8
Component: engine
2014-12-16 15:25:15 +10:00
912c56d931
add Scott's link checker script, and fix what it finds
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
a9df8138c1
add note to docs about overlay + btrfs
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 340ea25ac1c01561399175e4de8cecc2928ccf4b
Component: engine
2014-12-10 14:29:41 -08:00
be5e940362
Merge pull request #9489 from crosbymichael/info-root
...
Return docker's root dir in docker -D info
Upstream-commit: 12252e39a0abc188e1cd1fe9e921eef967308e1c
Component: engine
2014-12-08 09:05:00 -08:00
0703a67ce9
Return docker's root dir in docker -D info
...
This adds the docker daemon's root directory to docker info when running
in debug mode. This allows the user to view the root directory where
docker is writing and storing state.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 654da4e151c449725b6996d47b7ff33767e87da9
Component: engine
2014-12-05 12:13:25 -08:00
996111b8d3
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
2014-12-05 16:22:51 +10:00
6a592dd8e6
Auto-update documentation from the output of the cli.
...
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.
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: e01baa6be782320d3c0800697c882c2b919b202f
Component: engine
2014-12-05 10:43:38 +10:00
576cfafbf2
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
Upstream-commit: 5d49d2bb7a3bafcd1481a05d56ebc39ecd394393
Component: engine
2014-12-03 10:57:42 -08:00
34e4a16b13
Rename the overlay storage driver
...
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
215ea5a487
fixes as per feedback
...
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: 070a519a9b972ffffda62b82fbc27825d4a6f9b0
Component: engine
2014-12-03 12:46:23 +10:00
7045c111d6
Try out a different phrase for --icc
...
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: 94d67d5d5b300c346e17503810d521c91db89c14
Component: engine
2014-12-03 12:46:23 +10:00
291b777b81
Doc: described storage-driver options in cli reference
...
Documented --storage-opt=[] option in cli reference page. Content taken
from:
daemon/graphdriver/devmapper/README.md
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: a2aa78f6ec9e0a654f92c57336f8e487477d4040
Component: engine
2014-12-03 12:46:16 +10:00
d67f32cdc7
Man: describe --icc option better
...
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: a61a4a31882335020cfbffc49ffe274847a5c803
Component: engine
2014-12-03 12:46:16 +10:00
2de1f2dd9b
Merge pull request #9430 from sindhus/patch-3
...
Fix dead link cli.md
Upstream-commit: 315520b8453d4d0d8cf6e3651a06804dc47a8736
Component: engine
2014-12-02 16:06:48 -08:00
3e14694b93
Merge pull request #9330 from TomasTomecek/master
...
docs: man docker-images: inconsistent naming
Upstream-commit: b487d2f2ff9562301c1e9a1e705876ff3e3f3c10
Component: engine
2014-12-02 11:42:29 +10:00
81cd0946d7
Fix dead link cli.md
...
Upstream-commit: b1dc0db56ac9a27d51ab2a3684ed398d7b80a80c
Component: engine
2014-12-01 19:28:02 +05:30
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
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
f8672e482a
docs: man docker-images: inconsistent naming
...
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com >
Upstream-commit: 095027944f16205c1c75d47d2f60a7c1ac666bf1
Component: engine
2014-11-28 08:57:07 +01:00
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
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
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
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
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
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
bb8eca9ba7
Made wording a bit more generic.
...
Upstream-commit: 5deedef42c7d85835729ecf4fe61ec91612089af
Component: engine
2014-11-24 21:22:54 +03:00
9509d05af6
Fixed typo in documentation.
...
Upstream-commit: 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Component: engine
2014-11-23 22:59:35 +03:00
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
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
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
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
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
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
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
a8399407af
docs nits
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 284cbda9ceb368d4bb67c0c75739984622570d92
Component: engine
2014-11-20 19:54:03 +00:00
