toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,274 Commits 3 Branches 295 Tags
c78b55f0c10d60ec14a6e64fb0a8ee0fd4ebce1c
Commit Graph
24274 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis c78b55f0c1 Fix flaky TestApiStatsNetworkStats test 
It appears that on some systems apparmor gets in the way of libc.so.6
shared library being loaded - which means the ping fails.

To get around this if we run ping under `/lib64/ld-linux-x86-64.so.2`
then it works.  So we only do this for linux and only if the first attempt
fails. If this 2nd attempt fails then we'll show the original error to
the user for debugging.

Also s/Output/CombinedOutput/ to help debugging in the future. It didn't
show the real error msg.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 94d057130461b3b56957b2755da9dae00a937e81
Component: engine
 2016-05-23 19:00:19 -07:00
Alexander Morozov 85a166f069 Merge pull request #22892 from alexellis/20784-builder-intg2unit-tests-typo 
Typo fix wiildcard -> wildcard
Upstream-commit: f18224de143e7a129ef63cdfa53fa4b0a2d90f9d
Component: engine
 2016-05-22 12:07:11 -07:00
Alex Ellis dd19106ac3 Typo fix wiildcard -> wildcard 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
Upstream-commit: 86d48aa111384539b0d2bd50353c4d4c40a5750a
Component: engine
 2016-05-22 18:39:35 +01:00
Vincent Demeester c9241942c4 Merge pull request #22889 from thaJeztah/carry-22151-granular-vendoring 
Allow granular vendoring
Upstream-commit: 07dc6bfb46e3cd30d01e027680e18a662806bd49
Component: engine
 2016-05-22 18:30:59 +02:00
Vincent Demeester 4d15f45425 Merge pull request #22890 from thaJeztah/docs/slashes 
fix docs not building if branch-name contains slashes
Upstream-commit: 07f79621ea3aef5220d6c275fcab03bb4ed6ce22
Component: engine
 2016-05-22 17:49:08 +02:00
Vincent Demeester 773532708c Merge pull request #22706 from tkopczynski/20784-builder-intg2unit-tests 
Reimplement more builder integration tests as unit tests
Upstream-commit: e0653413ec9242a64ef8f2d23ad426efae81bf6b
Component: engine
 2016-05-22 17:48:30 +02:00
Sebastiaan van Stijn ebe14ff3b5 fix docs not building if branch-name contains slashes 
similar to the changes made in a4192471cd6d6012a66c19a635a11c7f6139d683,
clean the branch-name before using it as a tag-name
for the image that's built.

this also changes the "image name" for docs images
being built from "docs-base" to "docker-docs", to
be in line with the main Makefile

before this change:

  /usr/bin/make -C docs docs
  docker build -t "docs-base:docs/slashes" .
  invalid value "docs-base:docs/slashes" for flag -t: Error parsing reference: "docs-base:docs/slashes" is not a valid repository/tag
  See 'docker build --help'.
  make[1]: *** [docs-build] Error 125
  make: *** [docs] Error 2

after this change:

  /usr/bin/make -C docs docs
  docker build -t "docker-docs:docs-slashes" .
  Sending build context to Docker daemon 9.165 MB
  ...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9552e24af6151eaef07a481a1125059141d01f75
Component: engine
 2016-05-22 17:33:41 +02:00
Tibor Vass 0a347eac64 Allow granular vendoring 
hack/vendor.sh can now accept command line arguments

`./hack/vendor.sh github.com/docker/engine-api` will revendor only the
engine-api dependency.

`./hack/vendor.sh github.com/docker/engine-api v0.3.3` will vendor only
engine-api at the specified tag/commit.

`./hack/vendor.sh git github.com/docker/engine-api v0.3.3` is the same
but specifies the VCS for cases where the VCS is something else than git

`./hack/vendor.sh git golang.org/x/sys
eb2c74142fd19a79b3f237334c7384d5167b1b46
https://github.com/golang/sys.git` will vendor only golang.org/x/sys
downloading from the specified URL

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 80f61c41086cb2be8dbea023667f42a6c3c3248c
Component: engine
 2016-05-22 16:44:25 +02:00
Sebastiaan van Stijn 9071d0f71d Merge pull request #22747 from sdurrheimer/zsh-completion-images-filters 
Add zsh completion for 'docker images' filters
Upstream-commit: 96817cbdee48c4877da7a1f42009331befc6af0d
Component: engine
 2016-05-22 16:30:18 +02:00
Sebastiaan van Stijn 8ea54c334a Merge pull request #22885 from yongtang/05212016-typo-in-dockernetworks-md 
Fix a typos in docs of networking guide
Upstream-commit: c0c36bc15096cb7a81dfb9556b1300d0cd94013a
Component: engine
 2016-05-22 15:54:21 +02:00
Steve Durrheimer d84ac3cf8d Add zsh completion for 'docker images' filters 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11da243273908719c5ab755c6765a9561693ba30
Component: engine
 2016-05-22 13:01:08 +02:00
Tomasz Kopczynski 4197623885 Reimplementing more builder integration tests as unit tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: cf2611f3239d18919e437e82554cec178028612e
Component: engine
 2016-05-22 01:00:57 +02:00
Yong Tang 45541eb90b Fix a typos in docs of networking guide 
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
 2016-05-21 13:19:05 -07:00
Sebastiaan van Stijn a24dcb8ba0 Merge pull request #22876 from Microsoft/jjh/docsclarification 
Docs: JSON vs Shell clarification
Upstream-commit: e3079b470494a596bc8b35bc682e7c82ac9f0f9f
Component: engine
 2016-05-21 11:52:49 +02:00
Vincent Demeester 035b0db1ec Merge pull request #22775 from Microsoft/jjh/removewindowsdiff 
Windows: Remove windowsdiff graph driver
Upstream-commit: 7311d687e032b63715da74e327dfc06d3dba3b42
Component: engine
 2016-05-21 08:02:20 +02:00
Vincent Demeester bd09171248 Merge pull request #22863 from Saser/replace-unicode-single-quote 
Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
Upstream-commit: 4afc4edd74a49fe35b4e19f9fc813523387d85c0
Component: engine
 2016-05-21 07:42:26 +02:00
John Howard db5e90b511 Docs: JSON vs Shell clarification 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0cacd4bee2197e66105d960507f2ccac0f040263
Component: engine
 2016-05-20 20:56:08 -07:00
John Howard b94b3df539 Windows: Remove windowsdiff driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dd0fc2be8b8b0bbac3d3a478ae6939d9b742612d
Component: engine
 2016-05-20 16:18:19 -07:00
Christian Persson 8b67707840 Replace U+2018 and U+2019 with U+0027 in manpages 
Signed-off-by: Christian Persson <saser@live.se>
Upstream-commit: 19c43a69156ba70c5fa11a7cc55ecbd82f8d9421
Component: engine
 2016-05-20 20:15:57 +02:00
Vincent Demeester ed6e5fbdf6 Merge pull request #22820 from thaJeztah/suppress-incorrect-warning 
Suppress "IPv4 forwarding" warning for --net=host
Upstream-commit: 52debcd58ac91bf68503ce60561536911b74ff05
Component: engine
 2016-05-20 17:17:10 +02:00
Phil Estes cf71126b55 Merge pull request #22369 from vdemeester/carry-pr-25074 
Carry #20574 : Add a --filter option to `docker search`
Upstream-commit: 642b7b1b52cd6ab618051f158d2d5c5c6ed56b3c
Component: engine
 2016-05-20 10:13:30 -05:00
Sebastiaan van Stijn dea6010f20 Merge pull request #22839 from thaJeztah/update-selinux-example 
Remove MLS example from SELinux example in run reference
Upstream-commit: 74ee26ccebee1f33375967f32529a63e33ee6b73
Component: engine
 2016-05-20 15:11:35 +02:00
Sebastiaan van Stijn de6e0e2745 Remove MLS example from SELinux example in run reference 
Automatic translation of MLS labels is currently not
supported, so should not be documented as an example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 841cf6fffb6a821d6c5777871090c9d2bcc95b36
Component: engine
 2016-05-20 14:58:58 +02:00
Fabrizio Soppelsa 214a2bf487 Add a --filter option to docker search 
The filtering is made server-side, and the following filters are
supported:

* is-official (boolean)
* is-automated (boolean)
* has-stars (integer)

Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e009ebdf4c0bf0ff64da8d48eefad63d0644de3e
Component: engine
 2016-05-20 13:41:28 +02:00
Sebastiaan van Stijn f66ae64dbf Merge pull request #22554 from justincormack/seccap 
Align default seccomp profile with selected capabilities
Upstream-commit: 0e9009bae3a493cfce8a8334949b239efcb88f43
Component: engine
 2016-05-20 12:58:28 +02:00
Vincent Demeester 83971d6338 Merge pull request #22844 from normalfaults/mispell 
fixed spelling error in cli pull local test
Upstream-commit: 55cc1a2aa46616930a8b8357db562067138822a9
Component: engine
 2016-05-20 08:51:29 +02:00
Vincent Demeester 30a34f8a22 Merge pull request #22843 from normalfaults/bugfix 
removed unused const in config.go
Upstream-commit: 4c49adeaed6881e8c0ad65ba62df99a5b86aded7
Component: engine
 2016-05-20 08:50:33 +02:00
Vincent Demeester c2a010af33 Merge pull request #22000 from runcom/malformed-host-header-upstream 
Ignore invalid host header between go1.6 and old docker clients
Upstream-commit: 6024fc4d49560266b564c2bcff92d5961d9936a3
Component: engine
 2016-05-20 08:34:00 +02:00
Nirmal Mehta f157ec9b75 fixed spelling error in cli pull local test 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: f66f5d4bdc8ee12a2005df43bd279352705473d5
Component: engine
 2016-05-19 17:52:42 -05:00
Alexander Morozov 512cd9c6e9 Merge pull request #22842 from wendelfleming/FixWorkDir 
builder: fixed workdir comment
Upstream-commit: de908dfd2cfb640d7e55cb5092a59b75eb846948
Component: engine
 2016-05-19 15:23:45 -07:00
Nirmal Mehta 18845bac64 removed unused const in config.go 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: b3b5da3c555b8cc622c7e9ace73951b1e09c8b35
Component: engine
 2016-05-19 17:18:06 -05:00
Wendel Fleming 084ac6917b builder: fixed workdir comment 
Signed-off-by: Wendel Fleming <wfleming@usc.edu>
Upstream-commit: 131161bbc7a153eac0eccf02fcfb0fc2f5d368b5
Component: engine
 2016-05-19 15:40:46 -05:00
Antonio Murdaca 6b7262967f Ignore invalid host header between go1.6 and old docker clients 
BenchmarkWithHack-4	   50000	     37082 ns/op	  44.50
MB/s	    1920 B/op	      30 allocs/op
BenchmarkNoHack-4  	   50000	     30829 ns/op	  53.52
MB/s	       0 B/op	       0 allocs/op

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3d6f5984f52802fe2f4af0dd2296c9e2e4a1e003
Component: engine
 2016-05-19 21:07:45 +02:00
Alexander Morozov 6088ac5362 Merge pull request #22762 from wangxing1517/fix_mistake_400_for_500 
Fix bug which mistakes 400 error for 500
Upstream-commit: 376c15bbaa05d1458d9a0238b8854af5de2738a1
Component: engine
 2016-05-19 12:04:52 -07:00
Vincent Demeester de1f1fb963 Merge pull request #22481 from mrunalp/pid_container 
Add support for --pid=container:<id>
Upstream-commit: ebeb5a0422be47e703353e327606a380eb9962ab
Component: engine
 2016-05-19 19:00:40 +02:00
Wang Xing b96d544c7a Fix bug which mistakes 400 error for 500 
Signed-off-by: Wang Xing <hzwangxing@corp.netease.com>
Upstream-commit: beca2615782e24fa28803ada067129fdfa88c77d
Component: engine
 2016-05-19 20:01:55 +08:00
Sebastiaan van Stijn 5eb70b665b Merge pull request #22821 from zunayed/patch-1 
fix duplicate command in uninstall instructions
Upstream-commit: 1691fe6d23b083c67aea120f05c4797220388d59
Component: engine
 2016-05-18 22:26:25 +02:00
Zunayed Ali 77d9ae179d fix duplicate command in uninstall instructions 
Signed-off-by: Zunayed Ali <zunayed@gmail.com>
Upstream-commit: 160a6430a91de00c065fe5900e7fd96a46f87a45
Component: engine
 2016-05-18 20:12:29 +00:00
Alexander Morozov 1643154ef7 Merge pull request #22812 from thaJeztah/variable-typo 
fix typo in variable
Upstream-commit: 083dcd9c644e35129f21934ee401e0698b0d3c62
Component: engine
 2016-05-18 12:04:21 -07:00
John Howard d414f8f4a0 Merge pull request #22712 from swernli/update_fix 
Fixing Windows update logic.
Upstream-commit: 04eaa7490192ce101dec3ee3a7a0d02bb1e81426
Component: engine
 2016-05-18 12:00:10 -07:00
Sebastiaan van Stijn fac63eb804 Suppress "IPv4 forwarding" warning for --net=host 
Containers using the host network stack (--net=host)
are not affected by "ip-forwarding" being disabled,
so there's not need to show a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5fb7f9b29e9a85f36d02c4ecec6c04498fdb4315
Component: engine
 2016-05-18 20:10:31 +02:00
Sebastiaan van Stijn a6422fdd0e fix typo in variable 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: aac6008800ab06047ff000d6af487f3b52ba3019
Component: engine
 2016-05-18 15:26:16 +02:00
Alexander Morozov ef177628bc Merge pull request #22765 from cyphar/update-boltdb 
vendor: bump boltdb to v1.2.1
Upstream-commit: af705ca0ae1af735661ae464cb53d93a890450e7
Component: engine
 2016-05-18 06:03:02 -07:00
Vincent Demeester e4cff6bd8f Merge pull request #22778 from DoraALin/10972-docs-Support-for-non-proxied-private-registry 
doc:http pkg variables info added in pull cmd
Upstream-commit: 9751170f08a143e86709879c70b4a924c3161683
Component: engine
 2016-05-18 13:58:24 +02:00
Lin Lu 0bd075bc45 doc:proxy-setting info added in pull cmd. 
Replace Note with a new secion, reduce characters in
per line in 80. Add statement suggested by
https://github.com/thaJeztah

Signed-off-by: Lin Lu <doraalin@163.com>
Upstream-commit: 60940b0818d1d483cd017469f3e5ad21edce6198
Component: engine
 2016-05-18 18:16:22 +08:00
Vincent Demeester 8fe06d66da Merge pull request #22785 from runcom/fix-flaky-network 
TestPsGroupPortRange: allocate less ports
Upstream-commit: cbc404a0832bd95cce95783b87475d761be3a922
Component: engine
 2016-05-18 11:08:10 +02:00
Vincent Demeester ad7b4ee301 Merge pull request #22582 from aboch/vnd 
Vendoring libnetwork b66c038
Upstream-commit: 14b5a50f0a95a2b8f3ed7ab7469bbab02189a09c
Component: engine
 2016-05-18 10:55:28 +02:00
Mrunal Patel 612ad97231 Add support for --pid=container:<id> 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: fb43ef649bc6aa11ca19c0e046518e85e1c7e2fa
Component: engine
 2016-05-17 13:49:05 -04:00
Vincent Demeester f38f115e61 Merge pull request #22768 from mansinahar/run-cmd-doc 
Update 'run' command doc for better readability.  Issue:#22721
Upstream-commit: 28a436af3641f202287f98e326537a10897da9fa
Component: engine
 2016-05-17 17:06:12 +02:00
Brian Goff 82eeb64f5a Merge pull request #22788 from thaJeztah/fix-typo-in-completion 
Fix typo in zsh completion
Upstream-commit: 713b9541f5aa19aceaf18d7a8765d2fdda9d786a
Component: engine
 2016-05-17 08:26:25 -05:00