ff45a3cbac
Merge pull request #6784 from tianon/NikolaMandic-master
...
Update contrib/mkimage-arch.sh to remove use of "expect" since the output of pacstrap has changed
2014-06-30 16:04:09 -06:00
75b3b382ca
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
...
* 'master' of https://github.com/NikolaMandic/docker :
removed expect from mkimage-arch since it was not working
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-30 15:52:04 -06:00
36c78c9172
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
2014-06-30 10:41:07 -04:00
fef1e0a708
Merge pull request #6682 from erikh/6476-persistent_port_allocation
...
fix persistent port allocation
2014-06-30 10:14:17 -04:00
7128353be5
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
2014-06-30 08:21:57 -04:00
8d1cc68673
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
2014-06-30 20:00:12 +10:00
753ff36cc3
Merge pull request #6768 from SvenDowideit/add-1.13-api-to-docs-menu
...
Add the 1.13 API docs to the menu
2014-06-30 19:59:39 +10:00
26332fe339
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-30 14:19:16 +10:00
b4df555d27
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
2014-06-30 13:16:38 +10:00
8c765ae68a
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)
2014-06-29 22:25:12 -04:00
24bf8faa99
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)
2014-06-30 11:46:09 +10:00
0757a5663a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
2014-06-30 11:38:04 +10:00
860d8e9271
Merge pull request #6761 from fgrehm/patch-1
...
Remove extra "Docker" from docs index
2014-06-29 20:14:16 -04:00
3be683a0bb
Remove extra "Docker" from docs index
2014-06-29 19:45:08 -03:00
2075ef029e
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
2014-06-29 16:21:32 +10:00
5c0819a046
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com> (github: softprops)
2014-06-28 23:21:40 -04:00
7362a09cd9
Merge pull request #6752 from mchelen/patch-5
...
fix typo
2014-06-29 08:29:12 +10:00
525d41118e
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
2014-06-29 08:28:46 +10:00
0d2656ce6e
fix typo
2014-06-28 12:26:36 -04:00
4a5f09387e
missing `sudo`
2014-06-28 12:01:16 -04:00
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
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
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
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
ff20637499
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
2014-06-27 14:39:03 -07:00
018f887fe1
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
2014-06-27 14:37:12 -07:00
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
e5d3aa2765
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
2014-06-27 14:15:47 -07:00
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
680adb98e1
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
2014-06-27 13:33:13 -07:00
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
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
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
3a50675a68
Merge pull request #6735 from unclejack/add_test_pr-6701
...
Add test for PR 6701
2014-06-27 11:05:18 -07:00
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
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
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
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
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
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
510f1ba438
Merge pull request #6701 from crosbymichael/mount-root
...
Allow / as source of -v
2014-06-27 19:03:21 +03:00
815279c240
Update dockerimages.md
...
fix typo
2014-06-27 11:09:09 -04:00
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
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
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
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
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
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
a7722d752d
Merge pull request #6718 from mchelen/patch-1
...
Update dockerizing.md
2014-06-27 17:38:54 +10:00
0bfa14a70a
Update dockerizing.md
...
fix typo
2014-06-27 02:34:47 -04:00
Tianon Gravi
Tibor Vass
James Turnbull
Sven Dowideit
SvenDowideit
Fabio Rehm
doug tangren
Mike Chelen
Victor Vieux
Victor Vieux
Erik Hollensbe
Fred Lifton
Michael Crosby
Alexandr Morozov
Arnaud Porterie
unclejack
unclejack
Matthew Heon
Jiří Župka
Vincent Bernat