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
9af8758aff
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
Upstream-commit: ff206374999966421633a5f20e65e8df22eb2d1b
Component: engine
2014-06-27 14:39:03 -07:00
d6f80e2f4f
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
Upstream-commit: 018f887fe1346415ea6c1d9259dfd7b2bf131025
Component: engine
2014-06-27 14:37:12 -07:00
3aa7eb85d0
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
Upstream-commit: 74a34bb1fefbb9fd97562910a6cce7324f056be6
Component: engine
2014-06-27 14:29:36 -07: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
2b991fa5cf
Document memory limit sizing in manpages
...
The -m flag permits the setting of a memory limit when running a Docker
container. The actual limit set must be a multiple of page size on Linux, so
whatever number the uses passes in will be rounded up if needed. Document this
behavior to prevent confusion. Also fixed several small formatting and grammar
issues in the docker run manpage.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: 4361366783bbb4c9e4bd87e1c16da5a0988ed0bd
Component: engine
2014-06-27 10:07:50 -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
1581226df4
Fixed manpage generation script and README
...
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: fa3ac2d37032583a7c1171c24d71fbf93e330acc
Component: engine
2014-06-26 15:51:26 -04: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
ac17422c22
Merge pull request #6668 from erikh/fix-links-userguide
...
Add ticks to docker links userguide, was not being rendered properly.
Upstream-commit: 917b7436aff96796de5b92653f62135017957790
Component: engine
2014-06-26 10:08:08 +10:00
e43dcd9e0a
Merge pull request #6635 from SvenDowideit/deputise-fredlf
...
Upstream-commit: fe31ea7d0fc0945afcef7116c8d3eed89e3ab3b9
Component: engine
2014-06-25 17:00:57 -07:00
f113260ed3
Merge pull request #6626 from SvenDowideit/pr_out_updated_cloud_sdk_download_link_added_a_command_to_set_the_project
...
Updated Cloud SDK download link, added a command to set the project
Upstream-commit: 8eb34b2a0e73039b126c55c1c8f3328507041b80
Component: engine
2014-06-25 16:36:51 -07:00
acf65eee05
Merge pull request #6590 from robertbachmann/patch
...
Windows needs hardware virtualization
Upstream-commit: 6b6e915b858a9cf772e20ebb42cd67da4875157a
Component: engine
2014-06-25 16:36:30 -07:00
03a05388ef
Merge pull request #6639 from leeplay/userguide
...
Update dockervolumes.md
Upstream-commit: d3fde633bdc675a7a4cac8d0519e4cd96b69a03a
Component: engine
2014-06-26 09:19:34 +10:00
f6a0457a3f
Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
...
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
2014-06-25 19:10:19 -04:00
8a88644313
Import public GPG key after adding the openSUSE repository
...
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: 0b2b3221e21c8c6947585481ad476d57653ade28
Component: engine
2014-06-25 21:53:45 +02:00
053aa6d8a6
Add ticks to docker links userguide, was not being rendered properly, fix spelling error in /etc/hosts
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 6b2901954107c438d8e92dc6f595ec9bcd179777
Component: engine
2014-06-25 02:18:16 -07:00
64d580f03b
Update dockervolumes.md
...
~~~
kyu@kyu-HP-EliteBook-2570p:~/apps/docker/volume$ docker run -v /dbdata --name dbdata2 ubuntu
2014/06/25 14:17:44 Error response from daemon: No command specified
~~~
Upstream-commit: 9026888b109e6dd1042259ffd9e707d9e5f76d34
Component: engine
2014-06-25 14:53:59 +09:00
5252b72a99
Merge pull request #6656 from andersryanc/master
...
Remove Docs viewport tag to fix iPhone scaling
Upstream-commit: 01d4fd76dd60a24b24adbb8bb85623738c7636a9
Component: engine
2014-06-24 20:16:47 -07:00
f728e9c8d0
Document the pause and unpause commands available on API v1.12 onwards
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
Upstream-commit: 901a47daff63a4a7f22cbe556741081334c76572
Component: engine
2014-06-25 00:41:57 +02:00
18efee874d
Remove viewport tag to fix iPhone scaling
...
Upstream-commit: 7b1dd54d5d29b5d15e2081cc21b836a1907162cf
Component: engine
2014-06-24 15:16:40 -07:00
909b3a8ba8
Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
...
move the man pages to the docs/ dir
Upstream-commit: 11ef08402a5b8d39b1ec3fe004aa1d4b4c0ca5b3
Component: engine
2014-06-25 07:50:09 +10:00
986327e6e1
return 304 is status isn't modified in start and stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
2014-06-24 18:31:56 +00:00
ae52a1306d
Merge pull request #5413 from SvenDowideit/docker-info-list-sockets
...
Add Sockets (-H) list to `docker -D info`.
Upstream-commit: e23e3a1600e1b9178771557a843ed6e0c979f78c
Component: engine
2014-06-24 10:40:53 -07:00
c16ee9f478
Update dockervolumes.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: a51dc92379f6d647fa4c259c3d1d30d01852a580
Component: engine
2014-06-24 18:36:57 +09:00
b1bafb1f84
Add Fred as docs MAINTAINER
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 87d522a5576125515274022d0b49e7bdc2942d18
Component: engine
2014-06-24 15:45:44 +10:00
d6876fe608
Lets not download the gravatar and then download a different one after the js is triggered
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: c7a1bdf6c039c41877c007ab44902f084860ede0
Component: engine
2014-06-24 14:48:29 +10:00
b873d0d1bc
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 42be6f2957c945e070079ec773e29b356a9f9452
Component: engine
2014-06-24 13:07:42 +10:00
4369605adb
move api docs to APIv1.13
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cf513185b0803ac02bbd8cef05e3372e7fc3b269
Component: engine
2014-06-24 12:25:18 +10:00
90c80009e3
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +10:00
04e0cbb118
Merge pull request #6624 from jezenielzapanta/patch-1
...
Fix typo in the docs.
Upstream-commit: 664ba0c0315770b6a6608ee308d46b4b8fb82e76
Component: engine
2014-06-23 19:20:20 -07:00
Sven Dowideit
Mike Chelen
Fred Lifton
Matthew Heon
James Turnbull
leeplay
Paul Weaver
SvenDowideit
Tibor Vass
Michael Crosby
Victor Vieux
Travis Cline
Victor Vieux
O.S. Tezer
Solomon Hykes
Christian Berendt
Erik Hollensbe
Abel Muiño
Ryan Anderson
kyu
Sven Dowideit