Commit Graph

321 Commits

Author SHA1 Message Date
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
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
f6afb58177 events filtering
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00
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
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
addb2d43fa Hostname -> Name
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
2014-11-20 17:40:08 +00:00
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
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
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
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
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
9554f43a2c add docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8545155c41b1ccc22056733539660b1afa6790ef
Component: engine
2014-11-17 19:26:43 +00:00
40988ed79f Add --log-level support
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see

Closes #5198

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2facc0467336a80f48c765dbdbd803055a431aa9
Component: engine
2014-11-15 09:00:48 -08:00
ab9824e5ea Merge pull request #9100 from tiborvass/insecure-registry-cidr
Add the possibility of specifying a subnet for --insecure-registry
Upstream-commit: 36503981f009e914c9913613d3666824f6c492a0
Component: engine
2014-11-14 13:45:48 -08:00
d864c2f944 Rewrite documentation for insecure registries
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5937663a08d9e7ddc9347c4fc33a506d3d596ccd
Component: engine
2014-11-14 12:32:56 -08:00
ea3d6b1b0d Add the possibility of specifying a subnet for --insecure-registry
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 6aba75db4e7b0151aeb48f450bb43e659ce0ec82
Component: engine
2014-11-14 12:31:11 -08:00
0e182a21a4 Fix typo "infortmation" in docs for docker run
Upstream-commit: cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Component: engine
2014-11-13 23:26:49 +01:00
a56997089b Corrected description of --sig-proxy
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
2014-11-13 10:50:06 +01:00
4549c63c46 Add some details about the lifecycle of commands started with docker exec
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 447387474a5379f941457ece191c6920191c2a35
Component: engine
2014-11-11 15:56:27 +10:00
a14eceb8d8 makes the -s --size option documentation clearer #8950
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6dc11cc992531a2cf75666e417af7730a7f0764b
Component: engine
2014-11-07 11:56:56 +10:00
c0897a4514 Adding docker-cli run param to set MAC address
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
2014-11-01 15:35:09 +01:00
3613ec484c Merge pull request #8167 from brahmaroutu/expose_ports_1834
adding support for port ranges on --expose
Upstream-commit: 92bb49720199918b808bcb7544b69f16e3d45c49
Component: engine
2014-10-31 16:20:08 -07:00
b972337ce2 adding support for port ranges on --expose
Closes #1834

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: fd774a818c7d8942922b4f74eabd2a4e14094e1a
Component: engine
2014-10-31 23:06:30 +00:00
e50667ec3a Merge pull request #8818 from coolljt0725/fix_exec_help
Fix docker exec help messages.
Upstream-commit: 7cb12133ae362055ff51d1ea5f71ad9cef6b2fae
Component: engine
2014-10-31 14:36:01 -07:00
214986ab4e Merge pull request #8894 from vieux/fix_docs_filter
add missing 'current filter' to ps
Upstream-commit: 058aa0cbc2f1f85cf777138761389f9bb4af6584
Component: engine
2014-10-31 14:26:29 -07:00
287b15d7a3 add missing 'current filter' to ps
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f95d73dfd48ad4a3211f2f5e89e8195e2066c939
Component: engine
2014-10-31 18:28:10 +00:00
e8cb0ca4b5 Merge pull request #8839 from irachex/dns-search-doc
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
2014-10-31 11:25:57 -07:00
c33ebe12c4 Mapping change in code
Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: eaa050fdb8fed612b3cd5d204fddaedf27a20370
Component: engine
2014-10-31 09:57:54 +08:00