Sven Dowideit
525d41118e
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
2014-06-29 08:28:46 +10:00
Mike Chelen
0d2656ce6e
fix typo
2014-06-28 12:26:36 -04:00
Mike Chelen
4a5f09387e
missing `sudo`
2014-06-28 12:01:16 -04:00
LK4D4
ea464ea212
Update gorilla/context
...
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:38:29 +04:00
LK4D4
095cb7a818
Increase patricia.MaxPrefixPerNode
...
It allows to avoid redundant prefix splits
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:27:44 +04:00
LK4D4
2edfb1e696
Update go-patricia to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:20:31 +04:00
Sven Dowideit
4a9dc8d73d
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
2014-06-28 10:43:11 +10:00
Victor Vieux
1960da1dd0
Merge pull request #6713 from vieux/order_flag
...
sort flags with the same name in a consistent order
2014-06-27 17:10:55 -07:00
Victor Vieux
a0b2290713
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-27 23:09:41 +00:00
Erik Hollensbe
2cdcfc0c57
portmapper: unit tests for remap problem
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-27 15:57:31 -07:00
Fred Lifton
ff20637499
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
2014-06-27 14:39:03 -07:00
Fred Lifton
018f887fe1
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
2014-06-27 14:37:12 -07:00
Fred Lifton
74a34bb1fe
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
2014-06-27 14:29:36 -07:00
Michael Crosby
e5d3aa2765
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
2014-06-27 14:15:47 -07:00
Tibor Vass
5a3d774e56
allow overwrite in untar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-27 17:03:51 -04:00
Michael Crosby
680adb98e1
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
2014-06-27 13:33:13 -07:00
Michael Crosby
3aa75210c4
Merge pull request #6721 from LK4D4/integration_test_on_links
...
Integration cli tests on Links in inspect
2014-06-27 13:29:13 -07:00
Fred Lifton
0acec44374
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)
2014-06-27 12:45:55 -07:00
Alexandr Morozov
08182da5d8
Integration cli tests on Links in inspect
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 22:44:13 +04:00
Michael Crosby
3a50675a68
Merge pull request #6735 from unclejack/add_test_pr-6701
...
Add test for PR 6701
2014-06-27 11:05:18 -07:00
Michael Crosby
ade6bd7785
Merge pull request #6234 from jzupka/fix_check_default_ip
...
Adds check if default ip address is correct format.
2014-06-27 10:53:15 -07:00
Erik Hollensbe
e77729c2e0
Use last allocated port logic in port allocator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-27 10:51:26 -07:00
Erik Hollensbe
ffd68badc0
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)
2014-06-27 10:51:25 -07:00
Arnaud Porterie
dafddf461e
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)
2014-06-27 10:51:25 -07:00
unclejack
38b005ec69
integcli: add test to ensure -v /:/ isn't allowed
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-27 19:51:24 +03:00
unclejack
a1b6f350e8
correct typo - desination -> destination
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-27 19:49:40 +03:00
unclejack
510f1ba438
Merge pull request #6701 from crosbymichael/mount-root
...
Allow / as source of -v
2014-06-27 19:03:21 +03:00
Mike Chelen
815279c240
Update dockerimages.md
...
fix typo
2014-06-27 11:09:09 -04:00
Matthew Heon
4361366783
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)
2014-06-27 10:07:50 -04:00
Tianon Gravi
9b9d698081
Merge pull request #6729 from vincentbernat/fix/mkimage-use-var-tmp
...
Update mkimage scripts to use /var/tmp by default instead of /tmp
2014-06-27 08:04:05 -06:00
Jiří Župka
2fcbfb5a66
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)
2014-06-27 15:55:20 +02:00
Vincent Bernat
287e604a8f
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)
2014-06-27 14:43:12 +02:00
Alexandr Morozov
57d86a5619
Use State waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 15:07:40 +04:00
Alexandr Morozov
47065b9045
State refactoring and add waiting functions
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 15:05:48 +04:00
Sven Dowideit
a7722d752d
Merge pull request #6718 from mchelen/patch-1
...
Update dockerizing.md
2014-06-27 17:38:54 +10:00
Mike Chelen
0bfa14a70a
Update dockerizing.md
...
fix typo
2014-06-27 02:34:47 -04:00
James Turnbull
bc8d618cde
Merge pull request #6716 from leeplay/master
...
Update nodejs_web_app.md
2014-06-26 23:21:36 -07:00
James Turnbull
b074e9b01d
Merge pull request #6676 from berendt/opensuse_import_public_gpg_key
...
Import public GPG key after adding the openSUSE repository
2014-06-26 23:21:10 -07:00
James Turnbull
debbb26291
Merge pull request #6712 from SvenDowideit/pr_out_remove_superfluous_reptition_from_usingdocker_md
...
Remove superfluous reptition from usingdocker.md
2014-06-26 23:20:51 -07:00
leeplay
15ea1ca1f0
Update nodejs_web_app.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
2014-06-27 11:39:58 +09:00
Jonathan Boulle
d14cfc8d43
sort flags with the same name in a consistent order
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
2014-06-27 01:46:59 +00:00
Paul Weaver
748aaf3530
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)
2014-06-27 11:43:29 +10:00
Sven Dowideit
425ab3da5e
Merge pull request #6709 from SvenDowideit/show-my-orgs
...
Show the user's orgs, not-Sam's email
2014-06-27 11:38:52 +10:00
Sven Dowideit
5cabfd1526
Merge pull request #6694 from leeplay/examples
...
Update examples/nodejs_web_app
2014-06-27 11:27:02 +10:00
Tibor Vass
67f6b0fd43
Merge pull request #6703 from crosbymichael/update-libcontainer-dep
...
Update libcontainer to 53cfe0a1eba9145bf5329abb
2014-06-26 21:20:59 -04:00
SvenDowideit
e817681581
Yes, ok, not-Sam
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-27 11:10:20 +10:00
Tibor Vass
6e3fe93148
Merge pull request #6579 from vieux/dockerignore
...
Rebased Dockerignore
2014-06-26 21:00:43 -04:00
Michael Crosby
e35a9a7def
Merge pull request #6683 from vieux/add_links_inspect
...
add links to inspect for 'linking' containers
2014-06-26 17:33:02 -07:00
Victor Vieux
f7eaeae43c
Merge pull request #6708 from crosbymichael/fix-bunk-test
...
Fix sleep command in tests
2014-06-26 17:10:58 -07:00
Michael Crosby
012091a28f
Fix sleep command in tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-26 17:09:41 -07:00