docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
9,276 Commits 12 Branches 295 Tags
6b22b2d896a41fa37bb360253fc8ec3cb893dea6
Commit Graph

9276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrien Folie
6b22b2d896 Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: f337a52a6ec01684c326a827adbe3d0b8b5f1f53
Component: engine
 2014-07-03 01:39:08 +02:00
Victor Vieux
b8be307cab Merge pull request #6808 from vieux/pr_6806 
Add backwards READ compatibility for the old libcontainer API 
Upstream-commit: 8ea35892871f75cd0197a5c443054bf570ed6744
Component: engine
 2014-07-02 10:51:27 -07:00
Tibor Vass
bc22b11a74 Merge pull request #6780 from unclejack/tweak_cli_integration_tests 
Tweak cli integration tests
Upstream-commit: f357b18ee3550a4214d03c10cfe0bed10d6d0df5
Component: engine
 2014-07-02 13:16:26 -04:00
unclejack
e0255ad153 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
Upstream-commit: deb57c5144f75dc6e1e73194c86991264048ca4a
Component: engine
 2014-07-02 19:44:21 +03:00
Tianon Gravi
a17b20aaed Merge pull request #6814 from tianon/more-init-ulimit 
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
Upstream-commit: 292483531f269261d6d8b6a98c1a23879b00d851
Component: engine
 2014-07-02 10:08:11 -06:00
unclejack
977b717fdd integcli: add & use pullImageIfNotExist for pulls 
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dad476803719ae2e86c703981caef0462e25260c
Component: engine
 2014-07-02 18:45:11 +03:00
Tianon Gravi
a3d12bd8ea Add NOFILE and NPROC ulimit settings to the SysV init script 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bae79c3e7285c170f97a0f7f331a48fb47f0f40e
Component: engine
 2014-07-02 09:38:19 -06:00
Tianon Gravi
7c15233e4a Add NOFILE and NPROC ulimit settings to the OpenRC init script 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7abe70c0b1018729006fd5d614ada2dc67edb9b2
Component: engine
 2014-07-02 09:36:57 -06:00
Victor Vieux
ce98881516 fix compilation and panic 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: d403936818b8785b65ff55ebab0d266b4a871ef6
Component: engine
 2014-07-02 00:54:08 +00:00
Tibor Vass
356f6ecbf3 Add backwards READ compatibility for the old libcontainer API 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cccb64e8633eee309e6ce33c3bb41614edd70d81
Component: engine
 2014-07-02 00:19:05 +00:00
Fred Lifton
daa972d7b1 Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms 
expand to 'used b2d vm on any of the platforms'
Upstream-commit: 5ff18b8155b4cd6274b63ea227ff3d686464dc14
Component: engine
 2014-07-01 16:09:38 -07:00
Tibor Vass
684f8af215 Merge pull request #6748 from LK4D4/increase_max_patricia_prefix 
Increase max patricia prefix
Upstream-commit: b0824edc7c93db4c2e880931a4041ca1188a2edd
Component: engine
 2014-07-01 19:03:30 -04:00
Fred Lifton
5b3846e278 Merge pull request #6781 from anweiss/6738-dscarticle 
Add Article for PowerShell DSC
Upstream-commit: 96e2bfe28a27217c9ef48b84579290615c413fe4
Component: engine
 2014-07-01 15:48:19 -07:00
James Turnbull
b197a64c27 Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world 
removing the exclaimation mark from our hello-world examples, some users...
Upstream-commit: a52d90a100938f18411f128369923326e13ba905
Component: engine
 2014-07-01 18:10:17 -04:00
Sven Dowideit
23fab74a7a Lowercase world, because its not important. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: a09f99b8b0e157e3bb72ad0c9dad8d83896c5182
Component: engine
 2014-07-01 15:07:48 -07:00
SvenDowideit
ae635ad89d removing the exclaimation mark from our hello-world examples, some users get trapped by the shell 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 3091d9a31e81be9b8a99aaae8f7d5c2e64043286
Component: engine
 2014-07-01 15:07:48 -07:00
Sven Dowideit
5d4daaece0 convert OSX into OS X 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 91c4fbb7bfe8851130f746911e34b9d190bb4572
Component: engine
 2014-07-01 15:00:34 -07:00
SvenDowideit
9fa6f8bdbb expand to 'used b2d vm on any of the platforms' 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 84990731f79e4e94229a7ff2039f812e8b036643
Component: engine
 2014-07-01 15:00:34 -07:00
Tom Maaswinkel
58bb79fb17 Update usingdocker.md 
boot2docker on windows also uses an IP of its own.

Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu> (github: SvenDowideit)
Upstream-commit: fc4c0d9de45da5ff5664fb9c914b68e176c626cd
Component: engine
 2014-07-01 15:00:34 -07:00
Victor Vieux
dc89e9a3a5 Merge pull request #6803 from vieux/pr_6176 
Implement tail for docker logs
Upstream-commit: 49d49ac98f06d0016bcbda56f3ef158c64167bae
Component: engine
 2014-07-01 14:59:37 -07:00
Victor Vieux
fe06e048c4 update docs 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e06d533cc20c6aab10bf28a610445e7de6a8ef42
Component: engine
 2014-07-01 21:59:08 +00:00
Andrew Weiss
84b509b855 add DSC article 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
Upstream-commit: 5c344dca4be275fc4e85c5e2dfd35133aff5cb23
Component: engine
 2014-07-01 17:32:55 -04:00
Tibor Vass
65abacf6fb Merge pull request #6798 from tiborvass/docs-dockerignore 
More docs for dockerignore
Upstream-commit: 1822bf730eb7b32726647086dbfbd686efe39b02
Component: engine
 2014-07-01 17:23:00 -04:00
Alexandr Morozov
c1f6739a06 Implement tail for docker logs 
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
 2014-07-01 23:44:12 +04:00
Tibor Vass
3cde46554b more docs for dockerignore 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: c21c55e0b6d0f9582e4ee168fbd518b57dacc8fb
Component: engine
 2014-07-01 15:11:18 -04:00
Victor Vieux
e49c262737 Merge pull request #6787 from vieux/pause_commit2 
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
 2014-07-01 10:11:18 -07:00
Victor Vieux
afd3ebbfd3 updated docs & tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
 2014-07-01 17:10:00 +00:00
unclejack
0858137a49 Merge pull request #6785 from tiborvass/use_new_libcontainer_state_api 
Use new libcontainer.State API
Upstream-commit: c41c00cab45149e85f35eb8c98cddec62d332668
Component: engine
 2014-07-01 19:44:07 +03:00
James Turnbull
75ccf5b4e8 Merge pull request #6796 from jpetazzo/bundled-vs-packaged 
Add FAQ entry about bundled vs packaged libraries
Upstream-commit: 6ac20416c8da25fb5314ad3d1f6f16cf827274be
Component: engine
 2014-07-01 11:11:48 -04:00
Jérôme Petazzoni
7ce2f56d41 Add FAQ entry about bundled vs packaged libraries 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: ae1ff4dea311f8c6ff025b4835dc5d751f1b6261
Component: engine
 2014-07-01 07:47:59 -07:00
Solomon Hykes
4dbce92b61 Merge pull request #6366 from proppy/add-proppy-server 
api/MAINTAINERS: add proppy for server/
Upstream-commit: bc33ce0d8f8b3c3b3e80fbd4084f8a8e74130c0c
Component: engine
 2014-06-30 17:44:02 -07:00
Eric Windisch
ae1f05d70a Pause/freeze containers during commit 
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
 2014-07-01 00:30:21 +00:00
Sven Dowideit
e07af8c844 Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_ 
blindly make all uses of e\.?g\.? into e.g.,
Upstream-commit: 3f18afc94c8b8700884c052c869026ae26c45bb3
Component: engine
 2014-07-01 09:57:39 +10:00
SvenDowideit
413eaeb715 blindly make all uses of e\.?g\.? into e.g., 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fde10cf87b9f0df6d8aa8683721a6f9d71dda516
Component: engine
 2014-07-01 09:55:19 +10:00
Christian Berendt
7ad4718c9d Fixed typographical erros in the documentation 
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:

https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf

Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: berendt)

Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: SvenDowideit)
Upstream-commit: b44e13ae023816ed9d36b6dc6d74f089fc402cab
Component: engine
 2014-07-01 09:54:20 +10:00
Victor Vieux
b1c7a0a95d Merge pull request #6749 from LK4D4/update_gorilla_context 
Update gorilla/context
Upstream-commit: e6d9c097b29a4737973b54dbcb1611c3068608b5
Component: engine
 2014-06-30 16:52:34 -07:00
Tibor Vass
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
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
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