ce22a9b1ec
Use new libcontainer.State API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 262d45e0fe483dbc6d27bc6af51590a8be42d55f
Component: engine
2014-06-30 18:27:15 -04:00
795e9b6d57
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
Upstream-commit: 36c78c917240312e5521eccb195ccce31b29d0f8
Component: engine
2014-06-30 10:41:07 -04:00
37f1c826ae
Merge pull request #6682 from erikh/6476-persistent_port_allocation
...
fix persistent port allocation
Upstream-commit: fef1e0a7089820b06fdc2de3d536fe0e5e41f0cb
Component: engine
2014-06-30 10:14:17 -04: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
74e9171bcc
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 26332fe339d4d939d91fe00a0df849d564026005
Component: engine
2014-06-30 14:19:16 +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
91e2c5657a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
Upstream-commit: 0757a5663a704c5ffd1181b438703d9113dc4c8c
Component: engine
2014-06-30 11:38:04 +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
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
4d2725fe4d
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a0b229071394e6534808f16c4570ed8fd9ff3a1c
Component: engine
2014-06-27 23:09:41 +00:00
229de7479e
portmapper: unit tests for remap problem
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 2cdcfc0c57e375955d3ed7c8e1487f9d4751b255
Component: engine
2014-06-27 15:57:31 -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
4ad46ffe31
Use last allocated port logic in port allocator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: e77729c2e081c5ce55aa1d4f316b7c7703e5de96
Component: engine
2014-06-27 10:51:26 -07:00
52ddc2736f
Make ErrPortAlreadyAllocated an error interface with a few extras,
...
adjust tests to fit.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ffd68badc0a3d70fbd063903702355a387621b10
Component: engine
2014-06-27 10:51:25 -07:00
187971736c
Restrict portallocator to Docker allocated ports
...
Port allocation status is stored in a global map: a port detected in use will remain as such for the lifetime of the daemon. Change the behavior to only mark as allocated ports which are claimed by Docker itself (which we can trust to properly remove from the allocation map once released). Ports allocated by other applications will always be retried to account for the eventually of the port having been released.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
Upstream-commit: dafddf461eeabd792d9ced6caced75ad6961c1d7
Component: engine
2014-06-27 10:51:25 -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
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
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
