James Turnbull
92d24e3b7c
Merge pull request #9651 from kdomanski/filter_docs
...
Document container list filtering in API docs
2014-12-16 01:38:49 -05:00
Sven Dowideit
c9ca5c4dd3
Update the documentation for #9356 fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-16 15:25:15 +10:00
Sven Dowideit
fbb9223b1a
add Scott's link checker script, and fix what it finds
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-16 14:46:25 +10:00
Brian Goff
d44c9f9147
Fix volumes-from/bind-mounts passed in on start
...
Fixes #9628
Slightly reverts #8683 , HostConfig on start is _not_ deprecated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-15 16:51:15 -05:00
Kamil Domanski
51da97628a
Add available filters for containers, images and events to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
2014-12-15 16:51:29 +01:00
Kamil Domanski
37bdb05615
Add container list filtering to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
2014-12-15 16:50:56 +01:00
James Turnbull
eba451b659
Merge pull request #9566 from jfrazelle/btrfs-overlayfs
...
add note to docs about overlay + btrfs unsupported
2014-12-11 09:32:10 +11:00
Jessica Frazelle
340ea25ac1
add note to docs about overlay + btrfs
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-10 14:29:41 -08:00
Michael Crosby
fb810d18bd
Merge pull request #9318 from shishir-a412ed/doc-cpu-share
...
Enhanced description for 'docker run' command, -c/--cpu-shares flag
2014-12-09 17:21:09 -08:00
Arnaud Porterie
67e3ddb75f
Forbid client piping to tty enabled container
...
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-09 14:30:49 -08:00
shishir-a412ed
2597bffe9a
Added description for 'docker run' command, -c/--cpu-shares flag
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2014-12-09 09:55:56 -05:00
Fred Lifton
03d1622ab8
Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples
...
Add some cap add examples
2014-12-08 15:50:25 -08:00
Arnaud Porterie
12252e39a0
Merge pull request #9489 from crosbymichael/info-root
...
Return docker's root dir in docker -D info
2014-12-08 09:05:00 -08:00
Michael Crosby
654da4e151
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>
2014-12-05 12:13:25 -08:00
Michael Crosby
2525a04594
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
2014-12-05 11:16:19 -08:00
Sven Dowideit
5f2000944b
Add a fuse example, combining both SYS_ADMIN and --device
...
inspired by #9448 and #9487
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2014-12-05 16:42:48 +10:00
Sven Dowideit
48a596a804
add --cap-add=NET_ADMIN to make a new network device
...
inspired by #9452
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2014-12-05 16:30:54 +10:00
Sven Dowideit
8dfcbf62ed
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
2014-12-05 16:22:51 +10:00
James Turnbull
ebf89cf219
Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix
...
Fixing docs formatting for the forcerm flag on docker build
2014-12-04 21:54:14 -08:00
Sven Dowideit
e01baa6be7
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)
2014-12-05 10:43:38 +10:00
Jonathan A. Sternberg
eb7d646a44
Fixing docs formatting for the forcerm flag on docker build
...
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com>
2014-12-04 12:35:31 -05:00
Sven Dowideit
b91d330088
Note that using -lxc-conf to change things Docker manages has pitfalls
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-12-04 11:49:06 +10:00
James Turnbull
e15ffa45a6
Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs
...
Document fromSrc more clearly
2014-12-03 20:31:44 -05:00
Jessie Frazelle
67fda33197
Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
...
Initialize volumes when container is created
2014-12-03 15:42:09 -08:00
Jean-Paul Calderone
0888c1880f
Update the most recent released version of the docs as well.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
2014-12-03 17:14:08 -05:00
Jean-Paul Calderone
826f809d09
Talk about URL support and the real meaning of `-` in the latest `fromSrc` API documentation.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
2014-12-03 17:13:48 -05:00
Michael Crosby
5d49d2bb7a
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
2014-12-03 10:57:42 -08:00
Lénaïc Huard
d680ca5c96
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>
2014-12-03 13:57:23 +01:00
Sven Dowideit
070a519a9b
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)
2014-12-03 12:46:23 +10:00
Sven Dowideit
94d67d5d5b
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)
2014-12-03 12:46:23 +10:00
Michal Minar
a2aa78f6ec
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)
2014-12-03 12:46:16 +10:00
Michal Minar
a61a4a3188
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)
2014-12-03 12:46:16 +10:00
Fred Lifton
315520b845
Merge pull request #9430 from sindhus/patch-3
...
Fix dead link cli.md
2014-12-02 16:06:48 -08:00
Sven Dowideit
b487d2f2ff
Merge pull request #9330 from TomasTomecek/master
...
docs: man docker-images: inconsistent naming
2014-12-02 11:42:29 +10:00
Sindhu S
7754ef1f06
Fix dead link build.md
2014-12-01 19:35:58 +05:30
Sindhu S
b1dc0db56a
Fix dead link cli.md
2014-12-01 19:28:02 +05:30
Neal McBurnett
4bf72613fe
Fixes #9418 Docker Registry now open source
...
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
2014-11-30 21:12:57 -07:00
Alexander Boyd
eb8e84c48a
Correct inaccuracy in docker pull documentation
...
Signed-off-by: Alexander Boyd <alex@opengroove.org>
2014-11-29 23:36:19 -07:00
James Turnbull
353ff40181
Merge pull request #9332 from jacobat/patch-1
...
Update documentation for EXPOSE
2014-11-29 09:27:49 -05:00
Jacob Atzen
8432224f0e
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>
2014-11-29 15:18:18 +01:00
Fred Lifton
2c97cc3995
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
2014-11-28 17:44:11 -08:00
Tomas Tomecek
095027944f
docs: man docker-images: inconsistent naming
...
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2014-11-28 08:57:07 +01:00
Sven Dowideit
54050083d1
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)
2014-11-27 16:36:55 +10:00
James Turnbull
9e56c614a1
Merge pull request #9368 from msteinert/builder-md-typo
...
Fix a small typo
2014-11-26 22:39:19 -05:00
Sven Dowideit
498f208ade
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)
2014-11-27 12:06:40 +10:00
Michael Steinert
8b881df9b1
Fix a small typo
...
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
2014-11-26 13:09:44 -06:00
Jessie Frazelle
00c2a8f323
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
2014-11-25 18:03:51 -08:00
Jessie Frazelle
9160e01cef
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
2014-11-25 17:52:27 -08:00
Doug Davis
90928eb114
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>
2014-11-25 17:49:25 -08:00
Michael Crosby
df7c22dd23
Merge pull request #9162 from aidanhs/patch-1
...
Allow git@ urls for more than just github
2014-11-24 14:51:52 -08:00
Jessie Frazelle
39284be960
Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api
...
Cleanup exec API docs and available params
2014-11-24 13:35:45 -08:00
Aidan Hobson Sayers
c7e4cc4a53
Allow git@ prefixes for any hosted git service
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2014-11-24 20:49:54 +00:00
Michael Crosby
b4757445ae
Merge pull request #9301 from krivenok/master
...
Fixed typo in documentation.
2014-11-24 12:27:56 -08:00
Michael Crosby
5e19ecf25c
Merge pull request #9281 from unclejack/build_pull_flag
...
build: add pull flag to force image pulling
2014-11-24 12:10:45 -08:00
Dmitry V. Krivenok
5deedef42c
Made wording a bit more generic.
2014-11-24 21:22:54 +03:00
Richard Metzler
91a8b916b0
Empty Line should fix Markdown unordered list
...
Without the line break the list would render as one single paragraph.
2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok
745e3f77a1
Fixed typo in documentation.
2014-11-23 22:59:35 +03:00
Jessie Frazelle
c59b308b6b
Merge pull request #9223 from vbatts/vbatts-overlay_notfound
...
overlayfs: more helpful output when not supported
2014-11-21 19:58:01 -08:00
Brian Goff
d4ba00bd42
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>
2014-11-21 21:11:07 -05:00
Michael Crosby
c78bf8d86a
Merge pull request #9265 from vieux/daemon_labels
...
add daemon labels (displayed in docker info)
2014-11-21 15:14:27 -08:00
Sven Dowideit
44159f38d2
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...
2014-11-21 14:07:45 -08:00
Victor Vieux
62a7d75512
key=values -> key=value
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-21 19:15:22 +00:00
unclejack
054e57a622
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-11-21 19:59:44 +02:00
Michael Crosby
532e502e9c
Merge pull request #9259 from duglin/Issue9221
...
Make --tlsverify enable tls regardless of value specified
2014-11-20 17:41:31 -08:00
Doug Davis
ae9bd580af
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>
2014-11-20 16:09:06 -08:00
Fred Lifton
29f4ea2cd5
Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
...
Add an example that shows starting apache in the foreground
2014-11-20 16:02:38 -08:00
Michael Crosby
c1a40d9279
Merge pull request #9228 from SvenDowideit/update-tlsverify-doc
...
tlsverify flag has no dash
2014-11-20 15:19:31 -08:00
Sven Dowideit
8d3b13bd7a
Add an example that shows starting apache in the foreground
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-11-20 14:21:05 -08:00
Michael Crosby
58b6f31a7a
Merge pull request #8251 from duglin/Issue2333
...
Add support for ENV of the form: ENV name=value ...
2014-11-20 13:12:24 -08:00
Victor Vieux
284cbda9ce
docs nits
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:54:03 +00:00
Victor Vieux
7ff3b81054
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:46:48 +00:00
Victor Vieux
2fe36baa0a
add daemon labels
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:23:58 +00:00
Tibor Vass
998b591a71
Merge pull request #9201 from vieux/add_hostname_docker_info
...
Add hostname and ID docker info
2014-11-20 13:11:16 -05:00
Doug Davis
1314e1586f
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>
2014-11-20 09:54:28 -08:00
Victor Vieux
8ef36dcfe7
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 17:40:08 +00:00
Victor Vieux
227f4bbdb3
Hostname -> Name
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 17:40:08 +00:00
Vincent Batts
cb57c38848
overlayfs: add --storage-driver doc
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-19 19:36:05 -05:00
Sven Dowideit
3e5cb0c84f
Merge pull request #9191 from duglin/Issue8775
...
Be clearer in docs about COPY/ADD dirs
2014-11-19 15:26:20 -08:00
Sven Dowideit
c7e6ad8e98
Merge pull request #9144 from miminar/sigproxy_tty
...
Corrected description of --sig-proxy
2014-11-19 14:52:01 -08:00
Sven Dowideit
57b6993c2c
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>
2014-11-18 18:06:22 -08:00
Sven Dowideit
a0fb8eca30
tlsverify flag has no dash
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-11-18 17:42:33 -08:00
James Turnbull
af54dc215f
Merge pull request #9219 from acbodine/cleanup-remote-api-docs-start
...
Cleanup: fixes start response status code typo in examples
2014-11-18 20:25:36 -05:00
Andrew C. Bodine
f9cdad3272
Cleanup: fixes start response status code typo in examples
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2014-11-18 11:32:51 -08:00
Doug Davis
b4346c4810
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>
2014-11-18 04:33:53 -08:00
Sven Dowideit
e2d08bd5ea
Merge pull request #8749 from brahmaroutu/resize_uponstart_8728_2
...
Fix the documentation and integration test for container resize
2014-11-17 17:24:58 -08:00
Jessie Frazelle
882db5f885
Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer
...
makes the -s --size option documentation clearer #8950
2014-11-17 17:42:27 -07:00
Victor Vieux
8545155c41
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-17 19:26:43 +00:00
Srini Brahmaroutu
91fb9b2f5a
Fix the documentation and integration test for container resize
...
Closes #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-11-17 18:38:08 +00:00
Doug Davis
2facc04673
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>
2014-11-15 09:00:48 -08:00
Tibor Vass
36503981f0
Merge pull request #9100 from tiborvass/insecure-registry-cidr
...
Add the possibility of specifying a subnet for --insecure-registry
2014-11-14 13:45:48 -08:00
Tibor Vass
5937663a08
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-14 12:32:56 -08:00
Tibor Vass
6aba75db4e
Add the possibility of specifying a subnet for --insecure-registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-14 12:31:11 -08:00
Michael Crosby
07996d82c7
Merge pull request #9074 from rhatdan/shm
...
Allow IPC namespace to be shared between containers or with the host
2014-11-14 10:34:00 -08:00
Brian Goff
7107898d5c
Initialize volumes when container is created
...
Fixes #8942
Current behavior is that volumes aren't initialized until start.
Volumes still need to be initialized on start since VolumesFrom and
Binds can be passed in as part of HostConfig on start, however anything
that's already been initialized will just be skipped as is the current
behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-14 11:37:03 -05:00
pixelistik
cbf2879349
Fix typo "infortmation" in docs for `docker run`
2014-11-13 23:26:49 +01:00
Michal Minar
e71f241c4b
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>
2014-11-13 10:50:06 +01:00
Dan Walsh
497fc8876e
Allow IPC namespace to be shared between containers or with the host
...
Some workloads rely on IPC for communications with other processes. We
would like to split workloads between two container but still allow them
to communicate though shared IPC.
This patch mimics the --net code to allow --ipc=host to not split off
the IPC Namespace. ipc=container:CONTAINERID to share ipc between containers
If you share IPC between containers, then you need to make sure SELinux labels
match.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-11-12 11:29:58 -05:00
James Turnbull
492c4fc1a8
Merge pull request #9106 from duglin/TyposRemoteAPI
...
Add missing comma in docs
2014-11-11 22:48:30 -05:00
Doug Davis
814bc06d7b
Add missing comma in docs
...
Found by Michael Voznesensky <voznesenskym@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-11 15:18:20 -08:00
Fred Lifton
d6a4d045f7
Merge pull request #8840 from decadent/fix-da-copy-directive-reference
...
Nuh uh... quoth the build log: Source can't be a URL for COPY
2014-11-11 10:57:00 -08:00