bc68396213
Merge pull request #6752 from mchelen/patch-5
...
fix typo
Upstream-commit: 7362a09cd9e3efa3e0e065e5b8d69a9dfd614cf2
Component: engine
2014-06-29 08:29:12 +10:00
205ef46012
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
Upstream-commit: 525d41118e05305b5fa9c751096c18d6af8f96c9
Component: engine
2014-06-29 08:28:46 +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
e9e126ff9c
Merge pull request #6713 from vieux/order_flag
...
sort flags with the same name in a consistent order
Upstream-commit: 1960da1dd069b65642a6410d26f36dd30ad1308f
Component: engine
2014-06-27 17:10:55 -07: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
163b6661da
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
Upstream-commit: e5d3aa27659837e1847b4ccdc2a1fcbcd326f5dc
Component: engine
2014-06-27 14:15:47 -07:00
b4a009578f
allow overwrite in untar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 5a3d774e5651da772a065282a1fb1a31e19e911c
Component: engine
2014-06-27 17:03:51 -04:00
52930d7389
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
Upstream-commit: 680adb98e1fb4efc2116259887016e5d0fdd8c42
Component: engine
2014-06-27 13:33:13 -07:00
b39625ba3c
Merge pull request #6721 from LK4D4/integration_test_on_links
...
Integration cli tests on Links in inspect
Upstream-commit: 3aa75210c4decc0affe2f441d302fbbdec1fbc5c
Component: engine
2014-06-27 13:29:13 -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
91359fcf89
Integration cli tests on Links in inspect
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 08182da5d829762366b9bff9cb27b25a010ad1dd
Component: engine
2014-06-27 22:44:13 +04:00
a3c1ef441a
Merge pull request #6735 from unclejack/add_test_pr-6701
...
Add test for PR 6701
Upstream-commit: 3a50675a688bbe022f1870c38aadb5352e7869e6
Component: engine
2014-06-27 11:05:18 -07:00
d882414368
Merge pull request #6234 from jzupka/fix_check_default_ip
...
Adds check if default ip address is correct format.
Upstream-commit: ade6bd77853a7fd2cabfef1f307823dff284d4b1
Component: engine
2014-06-27 10:53:15 -07:00
1e5262e71f
integcli: add test to ensure -v /:/ isn't allowed
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 38b005ec69e62d93453ac4013fe6bfa2fccebc5d
Component: engine
2014-06-27 19:51:24 +03:00
e523e1e304
correct typo - desination -> destination
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: a1b6f350e806c43225b724530e563d6ff66e6b8a
Component: engine
2014-06-27 19:49:40 +03:00
0892a09088
Merge pull request #6701 from crosbymichael/mount-root
...
Allow / as source of -v
Upstream-commit: 510f1ba4382dfeafaede4cc4ffd6111e9a60bd7d
Component: engine
2014-06-27 19:03:21 +03: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
fe5d452650
Merge pull request #6729 from vincentbernat/fix/mkimage-use-var-tmp
...
Update mkimage scripts to use /var/tmp by default instead of /tmp
Upstream-commit: 9b9d6980816f40f1401e1b35fad01fcd3b69c26e
Component: engine
2014-06-27 08:04:05 -06:00
11bdd53bca
Adds check if default ip address is correct format.
...
It avoids hidden error when ports are redirected from
container to host using -p host_port:guest_port.
Docker-DCO-1.1-Signed-off-by: Jiří Župka <jzupka@redhat.com > (github: jzupka)
Upstream-commit: 2fcbfb5a66249739ef04d414307be01371190bef
Component: engine
2014-06-27 15:55:20 +02:00
0e8f1c0764
mkimage: use /var/tmp by default instead of /tmp
...
Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.
As explained in #6456 , the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
Upstream-commit: 287e604a8f53e569d355b1b6c75f6736f4927281
Component: engine
2014-06-27 14:43:12 +02:00
53991068e0
Use State waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 57d86a5619adae5e08e0e28fba99f6a7c2f5ee54
Component: engine
2014-06-27 15:07:40 +04:00
724bb65de7
State refactoring and add waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 47065b904559f36e83b924007c375f2de0f31af0
Component: engine
2014-06-27 15:05:48 +04:00
1bed6872f0
Merge pull request #6718 from mchelen/patch-1
...
Update dockerizing.md
Upstream-commit: a7722d752dce8c3b365394c396d4c0a9bee220b2
Component: engine
2014-06-27 17:38:54 +10: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
f94025a466
sort flags with the same name in a consistent order
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com > (github: jonboulle)
Upstream-commit: d14cfc8d435dbef0d70b6444b275a025e60ac171
Component: engine
2014-06-27 01:46:59 +00: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
88e1677028
Merge pull request #6703 from crosbymichael/update-libcontainer-dep
...
Update libcontainer to 53cfe0a1eba9145bf5329abb
Upstream-commit: 67f6b0fd43a7f4c5c1b07373f73568c0444145a5
Component: engine
2014-06-26 21:20:59 -04: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
9a58f779fd
Merge pull request #6708 from crosbymichael/fix-bunk-test
...
Fix sleep command in tests
Upstream-commit: f7eaeae43cf2391327978473cf7027be887588e3
Component: engine
2014-06-26 17:10:58 -07:00
d3e75544ad
Fix sleep command in tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 012091a28f8c2a96ad937f8c84992687e804ab71
Component: engine
2014-06-26 17:09:41 -07:00
68391774fe
Update libcontainer Context changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: c9fdb08bdafb90b76cfa804b079d2e446a3503e4
Component: engine
2014-06-26 16:56:39 -07:00
f1dd83f7f9
Update libcontainer to 53cfe0a1eba9145bf5329abbb52
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 41e75232914df5f5075d5d04cc2891fee9417067
Component: engine
2014-06-26 16:56:39 -07:00
0256ecf832
Merge pull request #6657 from unclejack/refactor_truncindex
...
refactor TruncIndex to use a trie & vendor deps
Upstream-commit: cab7894808d5b43590ec230c2391108536c34108
Component: engine
2014-06-26 16:53:49 -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
8928210aef
Merge pull request #6696 from cpuguy83/remove_dup_run_tests
...
Remove integration tests moved to integration-cli(dups)
Upstream-commit: aecdbf347104907cf9fcfaa1bb44320f53f4f922
Component: engine
2014-06-26 16:29:32 -07:00
bb2e21109b
fix rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8162dc031246c55e34530d2b35ff7087f143d1c2
Component: engine
2014-06-26 22:51:47 +00:00
47f54ad882
abort on error and fix debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0098360726e3df99e8f76dce9221a85dd89c2065
Component: engine
2014-06-26 22:49:08 +00:00
