32b5682b75
Merge pull request #10145 from duglin/Issue10141
...
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
2015-01-21 14:16:51 -08:00
f0170e8737
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
2015-01-21 11:44:23 -08:00
6bc1b160e8
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4b173199fde99a2b275421ed070b0ec004730e35
Component: engine
2015-01-21 08:55:23 -08:00
a77fb96f4c
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
2015-01-20 20:21:47 -08:00
f39e23250f
Merge pull request #10173 from SvenDowideit/release-1.5-combined-documentation
...
An initial quick import of documentation from Compose, Machine and Swarm
Upstream-commit: 620b58068f7c4e381254ad4c17cc4c7e0ca63a9b
Component: engine
2015-01-20 17:08:55 -08:00
1c8677b886
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
2015-01-20 18:20:13 -05:00
304cd59f67
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
f4d05bcf4d
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
2015-01-19 17:09:18 -08:00
3a60e835c5
Add docs for --memory-swap.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7bb4b56cf98662ef5f1deb64bdf8a120490bc258
Component: engine
2015-01-19 16:17:58 -08:00
6d7d2d6f8c
Merge pull request #10170 from thaJeztah/docs-note-environment-vars
...
Document that ENV vars are not automatically updated
Upstream-commit: 04d1b93fce4789ad186b4762d94629c11c79ffbe
Component: engine
2015-01-20 10:04:25 +10:00
9eb9d337ae
Merge pull request #10175 from fossilet/patch-1
...
Add usage of port mapping for Boot2docker.
Upstream-commit: e08858a80dfd1d947a7cba5031febb6868256195
Component: engine
2015-01-20 10:03:32 +10:00
bfeba0bea3
Merge pull request #10192 from icecrime/9951_client_proxy_doc
...
Add documentation for HTTP proxies
Upstream-commit: 826e0beade7deecdae19322e93a417c6c4872822
Component: engine
2015-01-19 18:55:25 -05:00
1a5071a250
Merge pull request #9826 from icecrime/8318_whitespace_add_copy
...
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
2015-01-19 18:37:53 -05:00
51e443fb29
Add documentation for HTTP proxies
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
2015-01-19 11:23:31 -08:00
5d2fe159f4
Docker run -e FOO should erase FOO if FOO isn't set in client env
...
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container. This means that if there's a value, its
set. But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env. So,
unset HOSTNAME
docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all
Closes #10141
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9ab73260f8e4662e7321b257c636928892f023cf
Component: engine
2015-01-19 08:00:32 -08:00
a9b7d25bb0
Merge pull request #10138 from ShockwaveNN/patch-1
...
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
2015-01-19 10:53:15 -05:00
681db1e57f
Merge pull request #10167 from bgazzera/master
...
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
2015-01-19 10:50:08 -05:00
b9a7e1b9ee
Fix typo.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com >
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
2015-01-19 18:02:23 +08:00
adb4e7d83e
Add usage of port mapping for Boot2docker.
...
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com >
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
2015-01-19 16:44:13 +08:00
7eb5278658
An initial quick import of documentation from Compose, Machine and Swarm
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1b2032c82e344b918578ce2de3618597e36fd7d6
Component: engine
2015-01-19 14:23:39 +10:00
9f931ee8fa
Update the docs for --link accept container id
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
2015-01-19 09:57:44 +08:00
86e0c72c59
Document that ENV vars are not automatically updated
...
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.
This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables
To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.
I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164 ).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3fb06dc104bb66c3ec7be8a95a33845310083999
Component: engine
2015-01-19 00:23:57 +01:00
a3290112e7
There was a missing command to re-run the web container.
...
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com >
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
2015-01-18 12:17:49 -03:00
611f8510fe
Merge pull request #9941 from SvenDowideit/build-pull-option-docs
...
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
2015-01-16 13:49:56 -08:00
712286a324
Merge pull request #10125 from estesp/9960-add-backingfs-info
...
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
2015-01-16 13:41:37 -08:00
310b2cd524
Add backing filesystem info to docker info command where applicable
...
Fixes #9960
This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 48b1dd0084904678728817d728bb9ab1c0183aad
Component: engine
2015-01-16 14:43:43 -05:00
663b86fdb0
Merge pull request #10127 from fredlf/known-issues
...
Adds new section for Known Issues to Release Notes.
Upstream-commit: 30468cdbae6deced7d13a4b3e52033100fe593ec
Component: engine
2015-01-16 09:45:34 -05:00
4f77faa073
fix link to introducion on 'Working with Docker Images' page
...
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag
Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com >
Upstream-commit: 43b97368422843108a2090633367beaba434245b
Component: engine
2015-01-16 14:16:10 +03:00
ce31e7fa97
Merge pull request #9937 from SvenDowideit/add-https-test
...
Add a containerised test for the https cert doc
Upstream-commit: 22437eb9609cdbf4ed221d07557e206bc0066e18
Component: engine
2015-01-15 17:53:40 -08:00
fe4979e250
Adds new section for Known Issues to Release Notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: f6777c7a40efdae161f6ba99223f4d6a625d4762
Component: engine
2015-01-15 16:09:48 -08:00
1964402004
Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export
...
Docs: Add note that export doesn't include volume data.
Upstream-commit: 9725433988b7d83bcbbf2af1976995efc0aadd4e
Component: engine
2015-01-16 12:15:46 +13:00
8333dd3c16
Merge pull request #9840 from nhsiehgit/searchapidocs
...
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
468fbf0066
Add the list of possible values for --log-level to help text
...
Closes #10034
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ed13110e88846694a675696c161ce6456402f3ef
Component: engine
2015-01-15 12:20:41 -08:00
3b76395570
changed format of cli note
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: c252d5f3f4fc98062fbda6335a04cca2602a4223
Component: engine
2015-01-15 08:39:16 -08:00
3abcc54bab
Docs: Add note that export doesn't include volume data.
...
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.
This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.
Relates to https://github.com/docker/docker/issues/10095
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
792af8c0a5
Add build --pull and evenets --filter flags to the docs for 1.4
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
c72b573e2b
added note to man & cli docs on search limit
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 92ef40a8260e5e8dcd5579a6f9d942c4e68702ed
Component: engine
2015-01-14 18:03:09 -08:00
2a3eb3ae39
Merge pull request #10093 from crosbymichael/readonly-containers
...
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
2ef8faf6e3
Add --readonly for read only container rootfs
...
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly. This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted. This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.
Closes #7923
Closes #8752
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
bafbcb6583
Add a note that remote and Boot2Docker users should not type sudo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
701611541f
Merge pull request #10076 from MalteJ/ipv6-docs
...
IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
Upstream-commit: c9dab702bed3ffd6335a61df74b73e89b44fcbf9
Component: engine
2015-01-13 17:05:28 -08:00
863904b2ee
Merge pull request #10080 from crosbymichael/pid-ns
...
Add --pid flag for staying in the host's pid namespace
Upstream-commit: 47e3da848ffbe88d0188ae6cfc09d6e1668bc293
Component: engine
2015-01-13 17:00:18 -08:00
b769333838
Merge pull request #10036 from HuKeping/docs-next
...
docs: update docker inspect part of docs
Upstream-commit: 8ac075b846609f73ad8aa29d6e9dbb6cd2392293
Component: engine
2015-01-13 16:43:42 -08:00
458ae31cfd
Allow the container to share the PID namespace with the host
...
We want to be able to use container without the PID namespace. We basically
want containers that can manage the host os, which I call Super Privileged
Containers. We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.
By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use. We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.
I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.
So currently I see us just needing docker run --pid=host
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 23feaaa240853c0e7f9817f8c2d272dd1c93ac3f
Component: engine
2015-01-13 16:35:17 -08:00
dbd5499197
Add reference to rename endpoint in correct version & add to new
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ee78e3f28459b655bf7df71eb4e2e22a04a8948d
Component: engine
2015-01-13 15:22:04 -08:00
7189e0cf12
IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: c03e15c9daddac86a4fdc7e6660f338b1b733f22
Component: engine
2015-01-14 00:20:17 +01:00
bea4f60ac9
Support whitespaces in ADD and COPY continued
...
Add tests and documentation for this new feature.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: cf455017e059e4b52d8d0357070e24ee153e3069
Component: engine
2015-01-13 11:34:15 -08:00
eacdfc7d44
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
8015360eaf
update copyrights to 2015
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
2015-01-12 22:47:36 +00:00
d352fd4587
Merge pull request #9962 from andi5/fix-doc-cmdline-port
...
Fix order of pause and port in command line documentation.
Upstream-commit: 43a75f5b9332f4b3c002f79ea342b00127811b5b
Component: engine
2015-01-12 13:22:51 -08:00
