Commit Graph

2607 Commits

Author SHA1 Message Date
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
de98d16e28 Merge pull request #9203 from somaopensource/fix_link
fix link to PACKAGERS.md
Upstream-commit: c8926bb5792ebea6e7b16935fa7fce577446574a
Component: engine
2014-11-18 18:23:33 -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
616801a125 Merge pull request #9189 from satnam6502/docfix
Consistently use sudo docker
Upstream-commit: 660eadae3d56195e05da170593af50f0d7752706
Component: engine
2014-11-18 01:17:48 -05:00
2e6d4cf87e Merge pull request #9193 from somaopensource/docs_misspelling
Fix misspelling
Upstream-commit: 4fff1505eb00cf679792b2e064dc1fa08a9c6587
Component: engine
2014-11-18 01:16:27 -05: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
5f5c30608e Consistently use sudo docker
Signed-off-by: Satnam Singh <satnam@raintown.org>
Upstream-commit: b273c447e0f0b124d5f81ff60033a4894e2acec8
Component: engine
2014-11-17 17:14:39 -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
42d3bfe3e2 fix link to PACKAGERS.md
fix link from /hack/PACKAGERS.md to /project/PACKAGERS.md

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: a3068a109cc2c472966d5a080f81ca344232f26c
Component: engine
2014-11-18 05:03:00 +09: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
d9d0e279e9 Fix misspelling
Fix misspelling from independant to independent

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: bdaa76e8cf3baeeaa645d91aed168028301f537f
Component: engine
2014-11-17 04:23:22 +09: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
0d25ac96b4 Merge pull request #9050 from prasincs/patch-1
Additional info for docker binary
Upstream-commit: 703ef3caa825cd0433ef5c0990641e7daaa4bceb
Component: engine
2014-11-10 20:22:05 -08:00
a613f7cb37 Merge pull request #9065 from tobegit3hub/master
Remove the redundant include_search in mkdocs.yml
Upstream-commit: 67c7faa002839ec1a038970c676772f282497370
Component: engine
2014-11-10 17:24:07 -08:00
af42de1e57 Merge pull request #9032 from fredlf/revise-docs-maintainers
Revise Docs Maintainers list
Upstream-commit: a1789a2eabc21defe30e90bc46edd3671b59cd7c
Component: engine
2014-11-10 17:11:25 -08:00
3e8752bcb7 properly line wrapping
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>
Upstream-commit: 48424df68539965fec3056f4c349383948890896
Component: engine
2014-11-10 20:06:22 -05: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
af07f89fd6 fixing punctuation and grammar
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>
Upstream-commit: cf19df4683f416e4d536e772dc1ff02334794264
Component: engine
2014-11-10 18:05:02 -05: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
49ecfd85ad Remove the redundant include_search in mkdocs.yml
Upstream-commit: b92d7cd60db0a03b0ace62a2a6c11df9f64f4256
Component: engine
2014-11-10 20:23:46 +08:00
67f7f0aa89 Merge pull request #9052 from andreyst/master
Fix typo in Docker Links chapter of User Guide
Upstream-commit: e4fe85fc9554c09c210bb441161906f34ebe90db
Component: engine
2014-11-10 00:10:38 -05:00
1089b95bed Merge pull request #9057 from andi5/typo-best-practices
Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: 1e75c9e8b40eea56e355f825b764d72ec5a89c19
Component: engine
2014-11-10 00:10:20 -05:00
2373a91d0b limiting to 80 chars
Signed-off-by: Prasanna Gautam < prasannagautam@gmail.com >
Upstream-commit: 3600bcb53127c7d9f67d639c1f4e61c460b1d605
Component: engine
2014-11-09 19:54:00 -05:00
dc90086a2e Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: b95f9c10ff2bd05fc2d30b30bebb8174883c683a
Component: engine
2014-11-10 01:00:05 +01:00
7b7fbcfc68 Fix typo in Docker Links chapter of User Guide
Upstream-commit: 932cc230814ba642c493c77d05932f63c0ef3e7f
Component: engine
2014-11-09 23:23:45 +03:00
e20e8b0d30 Additional info for docker binary
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>

I found that certain docker installations do not handle binding to the source directory quite right. Just writing it based on help from backjlack and tibor in IRC.
Upstream-commit: 22afaa628f319c852c536824cdd18444ddf87665
Component: engine
2014-11-09 10:28:45 -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
6c40ac56b7 Revise Docs Maintainers list
Removing Sonat from docs maintainers because he no longer has time to complete all the responsibilities. Many thanks to Sonat for his help.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 480b5e9c62819da3c6bff47faaec16acb42a0185
Component: engine
2014-11-07 13:13:01 -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