daa972d7b1
Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms
...
expand to 'used b2d vm on any of the platforms'
Upstream-commit: 5ff18b8155b4cd6274b63ea227ff3d686464dc14
Component: engine
2014-07-01 16:09:38 -07:00
5b3846e278
Merge pull request #6781 from anweiss/6738-dscarticle
...
Add Article for PowerShell DSC
Upstream-commit: 96e2bfe28a27217c9ef48b84579290615c413fe4
Component: engine
2014-07-01 15:48:19 -07:00
b197a64c27
Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world
...
removing the exclaimation mark from our hello-world examples, some users...
Upstream-commit: a52d90a100938f18411f128369923326e13ba905
Component: engine
2014-07-01 18:10:17 -04:00
23fab74a7a
Lowercase world, because its not important.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a09f99b8b0e157e3bb72ad0c9dad8d83896c5182
Component: engine
2014-07-01 15:07:48 -07:00
ae635ad89d
removing the exclaimation mark from our hello-world examples, some users get trapped by the shell
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3091d9a31e81be9b8a99aaae8f7d5c2e64043286
Component: engine
2014-07-01 15:07:48 -07:00
5d4daaece0
convert OSX into OS X
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 91c4fbb7bfe8851130f746911e34b9d190bb4572
Component: engine
2014-07-01 15:00:34 -07:00
9fa6f8bdbb
expand to 'used b2d vm on any of the platforms'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 84990731f79e4e94229a7ff2039f812e8b036643
Component: engine
2014-07-01 15:00:34 -07:00
58bb79fb17
Update usingdocker.md
...
boot2docker on windows also uses an IP of its own.
Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu > (github: SvenDowideit)
Upstream-commit: fc4c0d9de45da5ff5664fb9c914b68e176c626cd
Component: engine
2014-07-01 15:00:34 -07:00
dc89e9a3a5
Merge pull request #6803 from vieux/pr_6176
...
Implement tail for docker logs
Upstream-commit: 49d49ac98f06d0016bcbda56f3ef158c64167bae
Component: engine
2014-07-01 14:59:37 -07:00
fe06e048c4
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e06d533cc20c6aab10bf28a610445e7de6a8ef42
Component: engine
2014-07-01 21:59:08 +00:00
84b509b855
add DSC article
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com > (github: anweiss)
Upstream-commit: 5c344dca4be275fc4e85c5e2dfd35133aff5cb23
Component: engine
2014-07-01 17:32:55 -04:00
c1f6739a06
Implement tail for docker logs
...
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
3cde46554b
more docs for dockerignore
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c21c55e0b6d0f9582e4ee168fbd518b57dacc8fb
Component: engine
2014-07-01 15:11:18 -04:00
e49c262737
Merge pull request #6787 from vieux/pause_commit2
...
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
2014-07-01 10:11:18 -07:00
afd3ebbfd3
updated docs & tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
2014-07-01 17:10:00 +00:00
7ce2f56d41
Add FAQ entry about bundled vs packaged libraries
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: ae1ff4dea311f8c6ff025b4835dc5d751f1b6261
Component: engine
2014-07-01 07:47:59 -07:00
ae1f05d70a
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com > (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
413eaeb715
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fde10cf87b9f0df6d8aa8683721a6f9d71dda516
Component: engine
2014-07-01 09:55:19 +10:00
7ad4718c9d
Fixed typographical erros in the documentation
...
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:
https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: SvenDowideit)
Upstream-commit: b44e13ae023816ed9d36b6dc6d74f089fc402cab
Component: engine
2014-07-01 09:54:20 +10:00
4ca700fb27
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
Upstream-commit: 7128353be5e475c98c1c7454d7344d71ceefc3ea
Component: engine
2014-06-30 08:21:57 -04:00
b4d4865eb8
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
Upstream-commit: 8d1cc686735883f099bcacf78cdc7224b4373bff
Component: engine
2014-06-30 20:00:12 +10:00
866640533b
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
Upstream-commit: b4df555d27603621eacbcabb19d1db52bc370c86
Component: engine
2014-06-30 13:16:38 +10:00
ee97bfaf79
Formatting and consistency fixes to CLI and RUN references
...
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 8c765ae68a4a9aceb9886f4d92f2ded7af144e22
Component: engine
2014-06-29 22:25:12 -04:00
08986aa647
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 24bf8faa99ef7c80aca3ee3a6eac485f74e521ef
Component: engine
2014-06-30 11:46:09 +10:00
a201d5816f
Remove extra "Docker" from docs index
...
Upstream-commit: 3be683a0bbf25f41e9f4b1652f8f0784cafbd05b
Component: engine
2014-06-29 19:45:08 -03:00
88cb9a99d9
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
Upstream-commit: 2075ef029e37d54466a223f68c8837c7b67782c5
Component: engine
2014-06-29 16:21:32 +10:00
5c2debaa25
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com > (github: softprops)
Upstream-commit: 5c0819a0464624eba12b6a37462d549d7fed3be4
Component: engine
2014-06-28 23:21:40 -04:00
bc68396213
Merge pull request #6752 from mchelen/patch-5
...
fix typo
Upstream-commit: 7362a09cd9e3efa3e0e065e5b8d69a9dfd614cf2
Component: engine
2014-06-29 08:29:12 +10:00
889b867878
fix typo
...
Upstream-commit: 0d2656ce6e8536fcdb6d68b5899febe867f59c70
Component: engine
2014-06-28 12:26:36 -04:00
d1e69d47f8
missing sudo
...
Upstream-commit: 4a5f09387e17860ba748d94028cb2a307c9e0b11
Component: engine
2014-06-28 12:01:16 -04:00
67b3725d98
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
Upstream-commit: 4a9dc8d73d3f871f978c9cf19b5d8d646bdc44d5
Component: engine
2014-06-28 10:43:11 +10:00
a9eca6550a
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 0acec443745a917fb8e97d50609ff01b03888512
Component: engine
2014-06-27 12:45:55 -07:00
a541e4db62
Update dockerimages.md
...
fix typo
Upstream-commit: 815279c240e27478aa7ddde349761546a5c474fc
Component: engine
2014-06-27 11:09:09 -04:00
f8c849c6d4
Update dockerizing.md
...
fix typo
Upstream-commit: 0bfa14a70aa7dda06d769c5dd55354b13b417c94
Component: engine
2014-06-27 02:34:47 -04:00
c47640cfee
Merge pull request #6716 from leeplay/master
...
Update nodejs_web_app.md
Upstream-commit: bc8d618cde2adb6286d0c88ea1f402e62e6fecd4
Component: engine
2014-06-26 23:21:36 -07:00
cf59013ad7
Merge pull request #6676 from berendt/opensuse_import_public_gpg_key
...
Import public GPG key after adding the openSUSE repository
Upstream-commit: b074e9b01d2661809fc4c8c9b6dc8afecbabc058
Component: engine
2014-06-26 23:21:10 -07:00
85ad1af91f
Merge pull request #6712 from SvenDowideit/pr_out_remove_superfluous_reptition_from_usingdocker_md
...
Remove superfluous reptition from usingdocker.md
Upstream-commit: debbb262911136f63b9b91a9b49cb3db1a928be1
Component: engine
2014-06-26 23:20:51 -07:00
0b328b5e86
Update nodejs_web_app.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: 15ea1ca1f0d5190645b2ec0c0971daa3cdee30df
Component: engine
2014-06-27 11:39:58 +09:00
b5142ee5aa
Remove superfluous reptition from usingdocker.md
...
Clarify wording about default docker ps options
Fix typo in dockerlinks.md
Docker-DCO-1.1-Signed-off-by: Paul Weaver <pauweave@cisco.com > (github: ch3pjw)
Upstream-commit: 748aaf3530b943449d61952e06eb9aeab4a455ac
Component: engine
2014-06-27 11:43:29 +10:00
22689e00de
Merge pull request #6709 from SvenDowideit/show-my-orgs
...
Show the user's orgs, not-Sam's email
Upstream-commit: 425ab3da5e07ff7fd205e7d46e385d4bef281488
Component: engine
2014-06-27 11:38:52 +10:00
9daf1e7b1e
Merge pull request #6694 from leeplay/examples
...
Update examples/nodejs_web_app
Upstream-commit: 5cabfd1526f51c67836c4b4910518e4389fb23ac
Component: engine
2014-06-27 11:27:02 +10:00
d908f7b0b7
Yes, ok, not-Sam
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e817681581f433b37a8ab214a73edf5fb2a35473
Component: engine
2014-06-27 11:10:20 +10:00
3090f44756
Merge pull request #6579 from vieux/dockerignore
...
Rebased Dockerignore
Upstream-commit: 6e3fe9314801baf9e4d162619fabfca5b61456fa
Component: engine
2014-06-26 21:00:43 -04:00
7af08aef44
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
Upstream-commit: e35a9a7def6113ffff2c624142ef194abfa7e916
Component: engine
2014-06-26 17:33:02 -07:00
1d3a6ac762
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 250b0d070c7d8fce3d75bafc02c31ab3e356ba2e
Component: engine
2014-06-26 23:36:29 +00:00
a23ad7fc08
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
2014-06-26 22:49:08 +00:00
10316c12ae
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
2014-06-26 11:59:49 -07:00
befb61a0bc
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
2014-06-26 08:41:58 +01:00
ab438bdbda
Update examples/nodejs_web_app
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: 6bb6e422b5cd9e9ee97c5855a94b5776323a5626
Component: engine
2014-06-26 15:19:30 +09:00
51f8aff176
Add the missing paren to the documentation for docker commit too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 389916bf9ae62ded0e497512da22faba75d0cf2d
Component: engine
2014-06-26 11:06:45 +10:00
