toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,746 Commits 3 Branches 295 Tags
ee197e71e4b90cf92d04cce6b2c510e18c3c833c
Commit Graph
19746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn ee197e71e4 Merge pull request #17821 from HackToday/17820-fix-volume-doc 
Fixing wrong volume doc format
Upstream-commit: 2aa9d85c92803e7b4918694ac5009597fa3fc34b
Component: engine
 2015-11-10 19:03:09 +00:00
Sebastiaan van Stijn 9662b3cfe7 Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link 
Fix broken links in CONTRIBUTING.md
Upstream-commit: 9739aa056e11661a9637d38c588eeac28470dea7
Component: engine
 2015-11-10 18:31:09 +00:00
David Calavera eed9f30045 Merge pull request #17476 from coolljt0725/prevent_connect_to_host 
Fix connect to host and prevent disconnect from host for host network
Upstream-commit: 470fc94f3856640d1c85c90c62a78396a4d55d66
Component: engine
 2015-11-10 09:48:33 -08:00
Sebastiaan van Stijn b28166688f Merge pull request #17873 from Blaisorblade/patch-1 
Fix link to installation instructions
Upstream-commit: 4aaebec1bcaf104f89cf3bd9b1c6b3be0807eb42
Component: engine
 2015-11-10 17:32:21 +00:00
Paolo G. Giarrusso 542df63133 Fix link to installation instructions 
Fix #17872:

> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/, which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
 2015-11-10 18:06:58 +01:00
David Calavera b093321513 Merge pull request #17848 from Microsoft/jjh/tidyconfigstructs2 
Tidy hostconfig struct
Upstream-commit: a6a3c42b5869d4ef25240223db44fa1527d75346
Component: engine
 2015-11-10 08:57:05 -08:00
David Calavera 40d3ab07b8 Merge pull request #17789 from duglin/Issue17781 
Allow for env vars to have spaces in some cases
Upstream-commit: 014bab03efd67367d13231c08cc43e2e73578824
Component: engine
 2015-11-10 08:55:11 -08:00
Sebastiaan van Stijn f8fccbbc8d Fix broken links in CONTRIBUTING.md 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 850f7841f7e132460be44b9a9c5e5581368c296b
Component: engine
 2015-11-10 16:56:31 +01:00
Vincent Demeester 838e5c6fa6 Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all 
Add zsh completion for 'docker stats --all -a'
Upstream-commit: fb2bae5e162c91175f7cbc654de8e0fd132a0998
Component: engine
 2015-11-10 11:06:32 +01:00
Sebastiaan van Stijn 5b84049223 Merge pull request #17467 from WeiZhang555/fix-doc 
fix format of man page
Upstream-commit: 34916dcc4b11b03f5532dacc8c73ef9d0598133e
Component: engine
 2015-11-10 09:50:31 +00:00
Steve Durrheimer e9d65a16e5 Add zsh completion for 'docker stats --all -a' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
 2015-11-10 08:47:46 +01:00
Antonio Murdaca b05f4e5488 Merge pull request #17843 from LK4D4/discovery_refactor 
Refactoring in daemon/discovery.go
Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b
Component: engine
 2015-11-10 07:34:11 +01:00
Doug Davis 9a5f43818f Merge pull request #17847 from LK4D4/exec_unnec_var 
Remove unnecessary var block in monitorExec
Upstream-commit: 70579bd558e08fc88c06d8925e0be288692d1eac
Component: engine
 2015-11-09 23:32:38 -06:00
Zhang Wei be40e84376 Fix man pages 
Add contents and fix format problem for man pages.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d790469681b65d55e64750fd18d596db90a541df
Component: engine
 2015-11-10 09:33:55 +08:00
Sebastiaan van Stijn 6027f5a756 Merge pull request #17279 from someara/articles-chef 
Documenation update - articles/chef
Upstream-commit: c97ac4daf0f47e66a5a4ca0011722fdbd7efe16a
Component: engine
 2015-11-10 00:56:41 +00:00
David Calavera 4e36c60d66 Merge pull request #17844 from anthonydahanne/master 
Implicitly use swarm:latest 
Upstream-commit: 95903ece6043bdd180867cc46548c01d75b53c28
Component: engine
 2015-11-09 16:10:19 -08:00
John Howard 3640b2f4c8 Tidy hostconfig struct 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 51cf074e77020ab45b84c22259488b7a0eddc36a
Component: engine
 2015-11-09 15:24:23 -08:00
Alexander Morozov df0ccc7d18 Refactoring in daemon/discovery.go 
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60
Component: engine
 2015-11-09 15:21:27 -08:00
David Calavera d40820af47 Merge pull request #17838 from calavera/revert_17579 
Revert "Tidy config/hostconfig structures"
Upstream-commit: fa210a01be7927e8332c20da0770de0d855caf51
Component: engine
 2015-11-09 15:21:26 -08:00
Alexander Morozov 3ba5945bba Remove unnecessary var block in monitorExec 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 445675e8081ae1e911db2ebd57efd51329574cdf
Component: engine
 2015-11-09 15:14:20 -08:00
Tibor Vass c53c22b70c Merge pull request #17779 from calavera/fix_dns_regression 
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
 2015-11-09 18:07:07 -05:00
Anthony Dahanne 04e53e786a Implicitly use swarm:latest so that master and agent use the same version of swarm 
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
Upstream-commit: 4efe0def0ac2a8b6b74a818d23864f62abfaa521
Component: engine
 2015-11-09 15:05:17 -08:00
David Calavera 7523555ae3 Merge pull request #17450 from rhatdan/selinux 
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
 2015-11-09 13:19:28 -08:00
David Calavera 2f262fa249 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again 
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
 2015-11-09 13:15:50 -08:00
David Calavera 99a2fbf27e Revert "Tidy config/hostconfig structures" 
This reverts commit ad5052df234e4f48a93e22694f91fda36bb9e95d.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3a1200f9f11a016abd75588fa3812fb5505b2c3a
Component: engine
 2015-11-09 15:46:45 -05:00
Doug Davis 81b8a4871f Allow for env vars to have spaces in some cases 
Closes #17781

This allows for env vars in EXPOSE to be parsed for spaces so that each
"word" is then treated independently instead of as a single word/arg.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6990f8c6162b5b05118ab54f155eb5d86c85f2d4
Component: engine
 2015-11-09 12:42:56 -08:00
David Calavera d0affbc9f8 Merge pull request #17819 from tonistiigi/17766-fix-opq-dot 
Fix opq whiteouts problems for files with dot prefix
Upstream-commit: 69bc4ebe7a7d05a07929cb2d63f27b4ccf87c905
Component: engine
 2015-11-09 11:08:31 -08:00
Dan Walsh 21f4b9fc72 Fix relabel for SELinux 
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.

If the user does not specify Z or z on the volume mount we should
not attempt a relabel.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: d9011b36176d6245bdc25401633c213d73e14ea0
Component: engine
 2015-11-09 14:04:57 -05:00
Vincent Demeester 094e7a47db Merge pull request #17816 from coolljt0725/remove_execdriver_env 
Remove DOCKER_EXECDRIVER env
Upstream-commit: e509fe604c51cffb480098c4377c60bea1261fb1
Component: engine
 2015-11-09 19:59:18 +01:00
David Calavera 3ab3ccd0f9 Merge pull request #17834 from LK4D4/update_runc 
Update runc to introduce RelabelNeeded function
Upstream-commit: 56c8d4aaeff688ca5dc1f8f4c558d2e0110c3638
Component: engine
 2015-11-09 10:58:54 -08:00
Alexander Morozov d3bbdbd31a Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix 
Use checker for docker_cli_run_unix_test.go
Upstream-commit: 2786af3add53a4224c5bb7e0cd8e097cad45314f
Component: engine
 2015-11-09 10:44:32 -08:00
Vincent Demeester 48001c30bb dockerversion placeholder for library import 
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
 2015-11-09 19:32:46 +01:00
David Calavera 829d4787d5 Merge pull request #17810 from cpuguy83/graph_cleanup 
Graph: Un-export non-externally used functions
Upstream-commit: 0631ec6ca00da93576c215b939583b597ae8c110
Component: engine
 2015-11-09 10:30:13 -08:00
David Calavera 17291e75fa Merge pull request #17829 from albers/completion-stats--all 
bash completion for `docker stats --all`
Upstream-commit: e1910a8e231f55c92c765c7869bf874a1ca14106
Component: engine
 2015-11-09 10:29:33 -08:00
David Calavera eb1eef5173 Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs 
Tidy config/hostconfig structures
Upstream-commit: 427dcb7f825830bf66402cdb577dcd520499c1b0
Component: engine
 2015-11-09 10:14:58 -08:00
Alexander Morozov 7eead35e44 Update runc to introduce RelabelNeeded function 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
 2015-11-09 10:03:25 -08:00
David Calavera 0345dce058 Use an empty slice as default value for DNS, DNSSearch and DNSOptions 
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1a74a89f89affcfbe311e89aa752b3d551e0340
Component: engine
 2015-11-09 12:46:48 -05:00
Alexander Morozov 7359274c6d Merge pull request #17584 from Microsoft/10662-OOMKilled 
Windows: Refactor exitStatus structure
Upstream-commit: 7adfb3221efe7b97d00d1baacb74bed0013e6f76
Component: engine
 2015-11-09 09:23:08 -08:00
John Howard 626bc69479 Refactor exitStatus structure 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 77af7d1067b83cf683745e3f15ce19425beb34e0
Component: engine
 2015-11-09 08:26:35 -08:00
Alexander Morozov 4364a664e5 Merge pull request #17089 from Microsoft/10662-ansi 
Windows: Native ANSI console support
Upstream-commit: 28588efb47bc22c409f14ea4a534a01c53c6e1bd
Component: engine
 2015-11-09 08:05:08 -08:00
Harald Albers 77d68ba99d bash completion for docker stats --all 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
 2015-11-09 16:27:13 +01:00
Kai Qiang Wu(Kennan) e4ab924436 Fixing wrong volume doc format 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: a874ce08f3742d219f105a8b3d5cb7f37544824b
Component: engine
 2015-11-09 02:17:50 -06:00
Tonis Tiigi 958ff17b48 Fix opq whiteouts problems for files with dot prefix 
Fixes #17766

Previously, opaque directory whiteouts on non-native
graphdrivers depended on the file order, meaning
files added with the same layer before the whiteout
file `.wh..wh..opq` were also removed.

If that file happened to have subdirs, then calling
chtimes on those dirs after unpack would fail the pull.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: db3070ab1b9e394e45b1db22b8ed8352272d4410
Component: engine
 2015-11-08 23:00:01 -08:00
Vincent Demeester 0876b5f9e5 Merge pull request #17808 from bboreham/ipc-errormsg 
Fix typo in container-start error message
Upstream-commit: 944dc7fa8f2a91fef664e858d53d6bb7d3796266
Component: engine
 2015-11-09 07:58:03 +01:00
Vincent Demeester 4ba9dc1b18 Merge pull request #17817 from Microsoft/jjh/contained 
Typo s/contained/container
Upstream-commit: c13ca529d3f4ba23f4eb143a29cde01db688afca
Component: engine
 2015-11-09 07:55:44 +01:00
John Howard 56752590f4 Typo s/contained/container 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ff68910e2ac3e16d47de2b95a412e07586a7c60
Component: engine
 2015-11-08 18:29:34 -08:00
Lei Jitang c27bddf6a0 Prevent connecting to host and prevent disconnecting from host 
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a2d8c93fc690c2244a3bed32a2bbeb8dae449f90
Component: engine
 2015-11-09 10:19:53 +08:00
Lei Jitang e5d27b4461 Remove DOCKER_EXECDRIVER env 
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.

Signed-off-by: Lei Jitang <leijiang@huawei.com>
Upstream-commit: 3c4dab51d33f6e90c45de83c01474bc60aee3766
Component: engine
 2015-11-09 09:17:32 +08:00
Brian Goff d17a8d57a6 Un-export non-externally used functions 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d7a41325fab570b223ef55f31a30fd9ecce75bc1
Component: engine
 2015-11-08 15:51:27 -05:00
Bryan Boreham 3fb74544b6 Fix typo in error message 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 93405dd037ffb54e7e72d9d36be4a16d1d76fa50
Component: engine
 2015-11-08 18:05:34 +00:00