toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,507 Commits 3 Branches 295 Tags
08bbce0a2c1934b7de5b8db2c5ef4fdf00f1a521
Commit Graph
11507 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi 1ae219d16a 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
Upstream-commit: ff45a3cbac58e204b6888fe04052e2e03a1ee66f
Component: engine
 2014-06-30 16:04:09 -06:00
Tianon Gravi f6a9c4ccbd 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)
Upstream-commit: 75b3b382ca182bf9386bc03726b4edfa41f044e8
Component: engine
 2014-06-30 15:52:04 -06:00
unclejack 8d0912aa9e make TestRemoveContainerRunning handle signals 
This lowers the test execution time by about 5 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 63e28cc363c5f13288335e811f075e2423375b05
Component: engine
 2014-06-30 22:25:50 +03:00
unclejack bc5606f61f integration cli: add imageExists to docker utils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: eb1e8e884d92a7086af96663d0c658d838315490
Component: engine
 2014-06-30 22:22:29 +03:00
Tibor Vass 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
Tibor Vass 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
James Turnbull 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
Sven Dowideit 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
Sven Dowideit 4495a1a47f Merge pull request #6768 from SvenDowideit/add-1.13-api-to-docs-menu 
Add the 1.13 API docs to the menu
Upstream-commit: 753ff36cc322bceb93e33f4ab42ce1cc9e27d09a
Component: engine
 2014-06-30 19:59:39 +10:00
Adrien Folie 772cf3bd50 Add missing test for full coverage 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: c2699d8d896d592dc02276d76dfdf544fd26d0dd
Component: engine
 2014-06-30 09:36:46 +00:00
Alexandr Morozov f17116cbd3 Add synchronization in server.Containers 
This fixes races between ps and other operations
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: da853e98c94c9ce8001d3d1516ba0fd2614db3b0
Component: engine
 2014-06-30 10:52:11 +04:00
SvenDowideit 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
Sven Dowideit 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
James Turnbull 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
SvenDowideit 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
Sven Dowideit 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
James Turnbull fd51db3de3 Merge pull request #6761 from fgrehm/patch-1 
Remove extra "Docker" from docs index
Upstream-commit: 860d8e927108d6279c856135c9a348a4ad729afd
Component: engine
 2014-06-29 20:14:16 -04:00
Adrien Folie 845fae8efc Migrate TestGetImagesHistory into unit and CLI test 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 9a2771eac22950fce43702896052f5187944de6d
Component: engine
 2014-06-30 01:31:16 +02:00
Fabio Rehm a201d5816f Remove extra "Docker" from docs index 
Upstream-commit: 3be683a0bbf25f41e9f4b1652f8f0784cafbd05b
Component: engine
 2014-06-29 19:45:08 -03:00
Kato Kazuyoshi a5827383a9 Skip lxc_template_unit_test.go on non-Linux platforms 
It doesn't work without lxc-start.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: dda0ce645995d6dd2b6eb5848c30d305a3d220d2
Component: engine
 2014-06-29 17:11:30 +09:00
Sven Dowideit 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
Tianon Gravi fd631db79c Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively 
Also, add completion for "docker run -a" ("stdin", "stdout", and "stderr"), "docker run --env-file" (local filesystem), and some other minor code style tweaks.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 86f06b6deb6e5b9ddb30f781e81cc5b6241e20ae
Component: engine
 2014-06-28 23:17:51 -06:00
doug tangren 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
Jason Giedymin 018ff8d66c Add H3 menu entries for leftnav: 
- Add H3 formatting and entries to leftnav, to docs css.

Docker-DCO-1.1-Signed-off-by: Jason Giedymin <jasong@apache.org> (github: JasonGiedymin)
Upstream-commit: e4742dbb942b9db5f91dfbfb829525bdcac57ae1
Component: engine
 2014-06-28 23:17:46 -04:00
Sven Dowideit bc68396213 Merge pull request #6752 from mchelen/patch-5 
fix typo
Upstream-commit: 7362a09cd9e3efa3e0e065e5b8d69a9dfd614cf2
Component: engine
 2014-06-29 08:29:12 +10:00
Sven Dowideit 205ef46012 Merge pull request #6751 from mchelen/patch-3 
missing `sudo`
Upstream-commit: 525d41118e05305b5fa9c751096c18d6af8f96c9
Component: engine
 2014-06-29 08:28:46 +10:00
Mike Chelen 889b867878 fix typo 
Upstream-commit: 0d2656ce6e8536fcdb6d68b5899febe867f59c70
Component: engine
 2014-06-28 12:26:36 -04:00
Mike Chelen d1e69d47f8 missing sudo 
Upstream-commit: 4a5f09387e17860ba748d94028cb2a307c9e0b11
Component: engine
 2014-06-28 12:01:16 -04:00
LK4D4 953579a767 Update gorilla/context 
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: ea464ea212aa584dd0aa50820c78f7f60a77450d
Component: engine
 2014-06-28 12:38:29 +04:00
LK4D4 4a9952978a Increase patricia.MaxPrefixPerNode 
It allows to avoid redundant prefix splits
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 095cb7a81800512b99474aec7245bddddd1b2278
Component: engine
 2014-06-28 12:27:44 +04:00
LK4D4 7e94f694f2 Update go-patricia to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 2edfb1e696d8f46ea4276b3952078b1553ea42eb
Component: engine
 2014-06-28 12:20:31 +04:00
Sven Dowideit 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
Victor Vieux 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
Victor Vieux 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
Erik Hollensbe 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
Fred Lifton 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
Fred Lifton 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
Fred Lifton 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
Michael Crosby 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
Tibor Vass 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
Michael Crosby 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
Michael Crosby 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
Fred Lifton 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
Alexandr Morozov 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
Michael Crosby 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
Michael Crosby 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
Erik Hollensbe 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
Erik Hollensbe 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
Arnaud Porterie 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
unclejack 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