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
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
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
7a40da10bf
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8ef36dcfe75752a5705813e2d9fa9359a8162b18
Component: engine
2014-11-20 17:40:08 +00: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
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
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
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
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
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
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
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
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
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
8582931138
Merge pull request #9074 from rhatdan/shm
...
Allow IPC namespace to be shared between containers or with the host
Upstream-commit: 07996d82c76f0c73555d4de27371757e8879d378
Component: engine
2014-11-14 10:34:00 -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
09b8238fe6
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)
Upstream-commit: 497fc8876ede9924f61c0eee4dfadd71e5d9f537
Component: engine
2014-11-12 11:29:58 -05:00
3784297729
Merge pull request #9106 from duglin/TyposRemoteAPI
...
Add missing comma in docs
Upstream-commit: 492c4fc1a8027929facaea78697d57283ea3ebfd
Component: engine
2014-11-11 22:48:30 -05:00
97a0952687
Add missing comma in docs
...
Found by Michael Voznesensky <voznesenskym@gmail.com >
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 814bc06d7bf69c7775b775179c7a3edb8d30685c
Component: engine
2014-11-11 15:18:20 -08:00
08bbce0a2c
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
Upstream-commit: d6a4d045f7f5eef0f8cbf64bee330aefed6919c1
Component: engine
2014-11-11 10:57:00 -08: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
1517c675b8
Merge pull request #9069 from cpuguy83/docs_for_pr8509
...
Add missing docs for #8509
Upstream-commit: 970e404e9b7e7cf13c107d2c8154d01956785971
Component: engine
2014-11-10 17:04:28 -08:00
0cba5a8261
Merge pull request #8716 from duglin/Issue8331
...
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
Upstream-commit: 4fcd3dd7488ba779c48557e90598c81c94bf74e4
Component: engine
2014-11-10 13:03:57 -07:00
13b9154cf7
Add missing docs for #8509
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 271f54aea375158b808aa50db58711e7c1d3eef5
Component: engine
2014-11-10 12:25:17 -05:00
2f7c6a8c08
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
...
Closes #8331
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2e482c86bc14ddd4cfa45281dcf8f9ca141c9f14
Component: engine
2014-11-07 13:58:05 -08:00
2531bb36a4
Fix Docker Hub tags list specification
...
The current implementation of the Docker Hub returns a list of objects
containing the tag name and the layer id.
Docker-DCO-1.1-Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net >
Upstream-commit: c30ccc62e447ed570ca283feedd872eb359d457b
Component: engine
2014-11-07 17:16:42 +01: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
b3094dae92
Merge pull request #8970 from georgexsh/hyphen
...
unify `–`(en dash) to `-` when specifying options
Upstream-commit: 3afe9dbd246982dd82f2c53b647be29ea89a6485
Component: engine
2014-11-06 14:48:48 -08:00
9c47f4a11e
Merge pull request #8683 from cpuguy83/fix_api_docs
...
Bring API docs inline with 1.3
Upstream-commit: 56261daf32a1c5490ce0b5b500bf4245b6ac63bd
Component: engine
2014-11-05 16:34:27 -08:00
d833712ff9
Merge pull request #8874 from whoshuu/patch-1
...
Fix apparent copy paste mistake
Upstream-commit: f10fefe408d2b6b40191d802c5244ea6379954f9
Component: engine
2014-11-05 12:24:53 -08:00
412668aa98
Bring API docs inline with 1.3
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e86223e7b3ea7766164d809d2fbd463870e0614a
Component: engine
2014-11-05 09:38:44 -05:00
b25bfe881c
unify –(en dash) to - when specifying options
...
Signed-off-by: Xie Shi <georgexsh@gmail.com >
Upstream-commit: c81337d5dbcc6a670d24f2faf9b181730fe547e4
Component: engine
2014-11-05 13:50:59 +08:00
1ce2377d8b
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
Upstream-commit: 9eb8fcd58a5dc0a6fd812fc2bdc410f36dd63cc0
Component: engine
2014-11-04 07:54:59 -08:00
d1a9c32b50
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 28605bc4d55bcfc7a5562e4de3e01b1d5cd9bdcd
Component: engine
2014-11-04 15:19:47 +01:00
8be6c529c8
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
Upstream-commit: b68d7d39bcd96744eec883bb305e907c10fe6aa6
Component: engine
2014-11-03 23:09:16 -08:00
299f6b0aa6
Fix typo in api docs: stdou -> stdout
...
Upstream-commit: 4437573c96cdc52e98f44356be5c96dff4ce5907
Component: engine
2014-11-03 10:52:50 +00:00
590a54ca61
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
2014-11-03 11:43:27 +01:00
3856bb0808
Clarify USER instruction documentation
...
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: de9bf24750e0a9774a475eae74cbd2c241224e10
Component: engine
2014-11-01 14:04:51 -07: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
