Commit Graph

2631 Commits

Author SHA1 Message Date
0e537abc04 docs: Add 1.3.2 release notes
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4dd3368b51b2b00936f91fcc951d81d0c0d918ae
Component: engine
2014-11-25 03:02:27 +02:00
d74ab85d73 Merge pull request #9162 from aidanhs/patch-1
Allow git@ urls for more than just github
Upstream-commit: df7c22dd2307cb530b300a84ae9ddcc951dc3e47
Component: engine
2014-11-24 14:51:52 -08:00
d700b94cc1 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api
Cleanup exec API docs and available params
Upstream-commit: 39284be960d3d528ecf3faaa7900f4718e959c06
Component: engine
2014-11-24 13:35:45 -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
ea8fa13170 Empty Line should fix Markdown unordered list
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
2014-11-23 23:57:43 +01: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
1f85619ac6 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>
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
2014-11-21 21:11:07 -05: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
b4f3f7d0fc Merge pull request #9259 from duglin/Issue9221
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
2014-11-20 17:41:31 -08: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
ed1ade4c80 Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
Add an example that shows starting apache in the foreground
Upstream-commit: 29f4ea2cd5ee0988abb24264e4dbf01fa52d2d54
Component: engine
2014-11-20 16:02:38 -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
17282d5feb Add an example that shows starting apache in the foreground
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d3b13bd7a14aa41eb3d3f3aab1b974af1db4a50
Component: engine
2014-11-20 14:21:05 -08:00
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
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
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
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
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
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
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