toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,655 Commits 3 Branches 295 Tags
a3eaed6ca5b051ea4dccc093f2dbd5fa43218b2c
Commit Graph
11655 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass d3c1cd34ce Merge pull request #8739 from duglin/CleanupDockerIgnores 
Do some cleanup on .dockerignore paths
Upstream-commit: a85f58719f29f76f465747d095c85dbb8ba69d06
Component: engine
 2014-11-03 16:05:24 -05:00
Tibor Vass 935e9a4b52 Merge pull request #8932 from duglin/UpdateLogrus 
Update logrus to the latest so we can use ParseLevel() for PR #8335
Upstream-commit: 38d3888194c4639200da474d4e186dcbedb6f02d
Component: engine
 2014-11-03 16:00:22 -05:00
Fred Lifton fe1e9f085e Merge pull request #8907 from icecrime/clarify_user_instruction_doc 
Clarify USER instruction documentation
Upstream-commit: 8872c2903a36b3fbdb76046a4d15cf994d7e336a
Component: engine
 2014-11-03 11:58:56 -08:00
Doug Davis d09ed90b9d Update logrus to v0.6.0 so we can use ParseLevel() for PR #8335 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a12d89739412dc9fa9f961e0e4a310ec5a53bd74
Component: engine
 2014-11-03 11:57:30 -08:00
Michael Crosby aa23d4d1a4 Merge pull request #8927 from bfirsh/dont-pass-args-to-help-when-command-doesnt-exist 
Fix help text being incorrect with multiple args
Upstream-commit: 025363848b53bf6e2f3726e39fd7ee296d55d2b0
Component: engine
 2014-11-03 11:23:57 -08:00
Michael Crosby d79f92fe19 Merge pull request #8929 from LK4D4/fix_filter_hang 
Fix deadlock in ps exited filter
Upstream-commit: 9ef9bfd15119a3b7c84177ed20ead24d6fb2c2a9
Component: engine
 2014-11-03 11:07:24 -08:00
Vincent Batts c665136554 pkg/mount: adding fields supported by freebsd 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0e217c4a9e123551843ceeecdefe5d66b408cdf3
Component: engine
 2014-11-03 14:01:50 -05:00
Alexandr Morozov b9029ea913 Fix deadlock in ps exited filter 
Fixes #8909

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 03ea2166b66632ee7cdd824d7acd87b15c9bccb2
Component: engine
 2014-11-03 10:51:03 -08:00
Fred Lifton 0540ee405c Merge pull request #8928 from tianon/not-200-chars-anymore 
Update "official repos" doc to mention 100 char short desc limit
Upstream-commit: 0e4bf159a20efce3cba2109360ee0a94ee5b14aa
Component: engine
 2014-11-03 10:05:39 -08:00
Tianon Gravi 0798cdafc5 Update "official repos" doc to mention 100 char short desc limit 
The Hub no longer accepts short descriptions over 100 characters.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 693b9d335cc1fe688a7fffb62e5da97a5d5a3b13
Component: engine
 2014-11-03 10:12:05 -07:00
Ben Firshman 118bb8077c Fix help text being incorrect with multiple args 
E.g. "docker foobar run" would have printed "Command not found:
foobar" and printed the help text for "run". It should instead
print the root help message for docker.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: ef004ec03fe5aad33da7d53f196f16382c750d07
Component: engine
 2014-11-03 16:46:01 +00:00
Peter Ericson 299f6b0aa6 Fix typo in api docs: stdou -> stdout 
Upstream-commit: 4437573c96cdc52e98f44356be5c96dff4ce5907
Component: engine
 2014-11-03 10:52:50 +00:00
Malte Janduda 590a54ca61 enhancing set-macaddress docu 
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
 2014-11-03 11:43:27 +01:00
Doug Davis f115554d46 Do some cleanup on .dockerignore paths 
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
    "exclude".  While this isn't causing an issue right now, I got worried
	that in the future some code later on might interpret "" as something bad,
	like "everything" or ".".  So I added a check for an empty "exclude"
	and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
    However, if they put "./foo" then we won't due to the painfully
	simplistic logic of go's filepath.Match algorithm.  To help things
	a little (and to treat ./Dockerfile just like Dockerfile) I added
	code to filepath.Clean() each entry in .dockerignore.  It should
	result in the same semantic path but ensure that no matter how the
	user expresses the path, we'll match it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c0f0f5c9887032c606750b645001829d9f14f47c
Component: engine
 2014-11-02 11:29:46 -08:00
Mengdi Gao 535fe272a4 Remove extra line feed typo 
The removed extra line feed broke the paragraph at https://docs.docker.com/userguide/dockerizing/
Upstream-commit: 795533ede700395add26746b50f3d34aa3c1a3eb
Component: engine
 2014-11-02 22:55:36 +08:00
Médi-Rémi Hashim d9af4bf2cb Grammatical mistake in docs 
Change `The team can now use this image by run their own containers.` to `The team can now use this image by running their own containers.`
Upstream-commit: d22d32d61fc024d2c81e75f870d802f7a2cd28fd
Component: engine
 2014-11-01 21:22:43 +00:00
Arnaud Porterie 3856bb0808 Clarify USER instruction documentation 
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: de9bf24750e0a9774a475eae74cbd2c241224e10
Component: engine
 2014-11-01 14:04:51 -07:00
Daniel, Dao Quang Minh eaa70c2db5 change util.CopyDirectory to archive.CopyWithTar 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: e5ecfd3b178bbc399de344635606d82e147276ff
Component: engine
 2014-11-01 12:23:08 -04:00
Vladimir Bulyga 5e75202137 allow to use x-registry-auth header with enabled cors 
Signed-off-by: Vladimir Bulyga <xx@ccxx.cc>
Upstream-commit: f12b7b4bc21ff6a64505909a9ba49107877d2ca4
Component: engine
 2014-11-01 19:22:28 +03:00
Malte Janduda c0897a4514 Adding docker-cli run param to set MAC address 
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
 2014-11-01 15:35:09 +01:00
Derek McGowan b74bf3c41f Skip V2 registry and immediately fallback to V1 when mirrors are provided 
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 9d6391a9ebca6c7bd4b262ebb5a4baf9d2c222f9
Component: engine
 2014-10-31 18:10:48 -07:00
Fred Lifton 9fda67e5fe Merge pull request #8884 from thomasleveil/userguide-so26652877 
Reword a sentence bringing confusion about docker links
Upstream-commit: 4d4a7b81bf82e243bca07af815cb1fe03193b135
Component: engine
 2014-10-31 17:09:16 -07:00
Jessie Frazelle 3613ec484c Merge pull request #8167 from brahmaroutu/expose_ports_1834 
adding support for port ranges on --expose
Upstream-commit: 92bb49720199918b808bcb7544b69f16e3d45c49
Component: engine
 2014-10-31 16:20:08 -07:00
Srini Brahmaroutu b972337ce2 adding support for port ranges on --expose 
Closes #1834

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: fd774a818c7d8942922b4f74eabd2a4e14094e1a
Component: engine
 2014-10-31 23:06:30 +00:00
Jessie Frazelle 4047c8a0da Merge pull request #8468 from laktek/master 
Fix URL check in build from Git.
Upstream-commit: 9cc71b459771d0cbac51051410859fd878236920
Component: engine
 2014-10-31 14:43:21 -07:00
Michael Crosby e50667ec3a Merge pull request #8818 from coolljt0725/fix_exec_help 
Fix docker exec help messages.
Upstream-commit: 7cb12133ae362055ff51d1ea5f71ad9cef6b2fae
Component: engine
 2014-10-31 14:36:01 -07:00
Michael Crosby 912734006d Merge pull request #8878 from thaJeztah/patch-1 
Typo in 1.3.1 change log
Upstream-commit: a92393bb170be8e10cc2dcada748d0e5b1da0569
Component: engine
 2014-10-31 14:32:25 -07:00
Jessie Frazelle 214986ab4e Merge pull request #8894 from vieux/fix_docs_filter 
add missing 'current filter' to ps
Upstream-commit: 058aa0cbc2f1f85cf777138761389f9bb4af6584
Component: engine
 2014-10-31 14:26:29 -07:00
Jessie Frazelle 21782f3667 Merge pull request #8895 from erikh/proxy_udp_size 
pkg/proxy: Bump the maximum size of a UDP packet.
Upstream-commit: 7a2dc8b889e6154a6bfc93305382c894f716d61d
Component: engine
 2014-10-31 13:11:54 -07:00
Vincent Batts 9717d8585b pkg/mount: testing for linux sharedsubtree mounts 
* shared
* shared/slave
* unbindable
* private

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7a3a93871218e5bc50a368f00f043c84004e5986
Component: engine
 2014-10-31 15:31:34 -04:00
Erik Hollensbe fc011be6fb pkg/proxy: Bump the maximum size of a UDP packet. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5a73be8e9fbe5defc9fc71c6839bea1d888d6a95
Component: engine
 2014-10-31 18:56:07 +00:00
Victor Vieux 287b15d7a3 add missing 'current filter' to ps 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f95d73dfd48ad4a3211f2f5e89e8195e2066c939
Component: engine
 2014-10-31 18:28:10 +00:00
Michael Crosby e8cb0ca4b5 Merge pull request #8839 from irachex/dns-search-doc 
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
 2014-10-31 11:25:57 -07:00
Vincent Batts 0cdf5185f2 pkg/mount: add more sharesubtree options 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 06bd66a1f8079c9135acc34bcb9d46c439b429f1
Component: engine
 2014-10-31 13:29:35 -04:00
Thomas LEVEIL d4dfa6563a Reword a sentence bringing confusion about docker links 
As [discovered][1] doing user support, the sentence `You've learned that a link creates a
source container that can provide information about itself to a recipient container` brings
confusion.

[1]: http://stackoverflow.com/questions/26652877/how-to-avoid-redundant-container-linking-in-docker-when-propagating-ip-addresses/26654203?noredirect=1#comment41945048_26654203

Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com>
Upstream-commit: 906985123aa6b7874c3c0e21f0fb5603928ff6dd
Component: engine
 2014-10-31 13:00:59 +00:00
Sebastiaan van Stijn 76705656f8 Typo in 1.3.1 change log 
Replaced envrionment -> environment

Signed-off-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Upstream-commit: 29965246a735acbdbd9cbb4e54f1d2d9efb120f3
Component: engine
 2014-10-31 08:31:20 +01:00
Erik Hollensbe 7c71344f59 proxy: Fix a potential panic handling error states. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ad5b307d0fb00ff0a63b3f97e529fa67bfce50b3
Component: engine
 2014-10-31 04:20:26 +00:00
Huu Nguyen 7a8d9de28f Remove out-of-context code block 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: 8453cf0671879aef04f96ffce52bf3fbcb75ca13
Component: engine
 2014-10-30 23:58:14 -04:00
Huu Nguyen a8e1069f16 Fix apparent copy paste mistake 
The note under the RUN header refers to the CMD instruction. It should refer to the RUN instruction instead.

Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: b16f3736edf2427761cbc1c8fc5c4892299b2232
Component: engine
 2014-10-30 23:22:51 -04:00
Huayi Zhang c33ebe12c4 Mapping change in code 
Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: eaa050fdb8fed612b3cd5d204fddaedf27a20370
Component: engine
 2014-10-31 09:57:54 +08:00
Sven Dowideit 0dbcc807c8 Merge pull request #8837 from sawalls/patch-2 
ubuntulinux.md - old commands, typo, section movement
Upstream-commit: 107898a773d7345119917cf8f879a2c71f0a940c
Component: engine
 2014-10-30 18:48:24 -07:00
Lei Jitang 4454d2b409 Fix docker exec command help messages 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
 2014-10-31 09:36:07 +08:00
Fred Lifton 7791553e61 Merge pull request #8873 from SvenDowideit/de-cleanup-Dockerfile 
Yes, the review really should have picked up this spelling mistake
Upstream-commit: c2ff42552ab1fce8c4385d32b667aee676d70f70
Component: engine
 2014-10-30 18:32:28 -07:00
Scott Walls 4085dd6a28 ubuntulinux.md - old commands, typo, section movement 
- Removed some commands related to autocomplete/symlinks that don't seem to be required anymore on Ubuntu 14.04
- Fixed one minor typo ("see LINK _for_ details," not "see LINK details")
- Moved section "Giving non-root access" to top level, rather than being under Ubuntu 13 (the section isn't specific to Ubuntu 13, and even references Ubuntu 14).

Signed-off-by: Scott Walls <sawalls@umich.edu>
Upstream-commit: bc62a35ffb2eeacb3ae79bc65076a01744d78a5d
Component: engine
 2014-10-30 18:28:37 -07:00
Sven Dowideit f79466b12e Yes, the review really should have picked up this spelling mistake 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: bfe21f095d491dc9ee7e664b260239cbed8f505f
Component: engine
 2014-10-31 11:10:17 +10:00
Jessie Frazelle b39bfb477a Merge pull request #8850 from shuai-z/clean-mount 
Clear the internal state before raising error.
Upstream-commit: f68b8b33e6827c54d86abdd7ef36356453d3703b
Component: engine
 2014-10-30 18:01:01 -07:00
Jessie Frazelle 863c1e2270 Merge pull request #8866 from tonistiigi/fix-8832-logs-panic 
Fix panic on slow log consumer.
Upstream-commit: aca253d6d0b84c74a32c624d7c39e3a5fcae7773
Component: engine
 2014-10-30 17:40:46 -07:00
Jessie Frazelle 68f6d60698 Merge pull request #8510 from hqhq/graphdriver_bug 
daemon: resolve the graphdriver to show
Upstream-commit: 793fb26bffd27f4db9324bc38f64fee78d5ba874
Component: engine
 2014-10-30 17:40:30 -07:00
Tibor Vass 76ebfb2af3 Merge pull request #8870 from tiborvass/merge_release_v1.3.1 
Merge release v1.3.1
Upstream-commit: 6d6dc2c1a1e36a2c3992186664d4513ce28e84ae
Component: engine
 2014-10-30 20:24:34 -04:00
Tibor Vass 0d58dc079e Change version to 1.3.1-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: b9fcdb81917f2258b295a14398054b40bb6919b8
Component: engine
 2014-10-30 19:45:07 -04:00