toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,866 Commits 3 Branches 295 Tags
05cae6be4e4b4298110815b7732b9853eeab3396
Commit Graph
41866 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 05cae6be4e Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 17:02:54 +00:00
Sebastiaan van Stijn adf79edc07 Merge pull request #37472 from thaJeztah/no_unknown 
Do not return "<unknown>" in /info response
Upstream-commit: 0a4f89566a22a07427d850a8d70f264210062da0
Component: engine
 2018-08-16 14:56:31 +02:00
GordonTheTurtle a635bc1d4a Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 09:01:01 +00:00
Vincent Demeester 3baa6424ff Merge pull request #37592 from kolyshkin/no-go-version-env 
hack/make.ps1: don't rely on GO_VERSION
Upstream-commit: b1ba744a24d09dc853aef970985fa03452084e06
Component: engine
 2018-08-16 09:22:55 +02:00
GordonTheTurtle 9f84af0b04 Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 05:01:14 +00:00
GordonTheTurtle dddebc37ad Merge component 'cli' from git@github.com:docker/cli master 2018-08-16 04:36:35 +00:00
Tibor Vass aecdb056f0 Merge pull request #1276 from tiborvass/buildkit-progress-flag 
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
Upstream-commit: 964173997d
Component: cli
 2018-08-15 20:42:47 -07:00
Akihiro Suda 2418c55ad0 Merge pull request #37597 from tiborvass/fix-cancel-bug 
builder: do not cancel buildkit status request
Upstream-commit: 080c27dd1374d9be2e3e53bcffe62d7bb3ec0a3b
Component: engine
 2018-08-16 12:42:35 +09:00
GordonTheTurtle 3606edfdc9 Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 01:01:30 +00:00
Yong Tang 588ae61588 Merge pull request #37600 from edrevo/conemu-fix 
Fix #28814: use emulation for ConEmu and ConsoleZ
Upstream-commit: 74c43af1a3ba70a044971679c91c283ecf2b34df
Component: engine
 2018-08-15 16:50:05 -07:00
GordonTheTurtle bc6836aa1b Merge component 'engine' from git@github.com:docker/engine master 2018-08-15 21:02:36 +00:00
Tibor Vass b8b3a2fa72 Merge pull request #37640 from dhiltgen/bump_api_version 
Bump API version to 1.39
Upstream-commit: bf3d6a50137d1b7ded440634cec65f894f952a29
Component: engine
 2018-08-15 11:57:04 -07:00
Kir Kolyshkin 6a77a79235 hack/make.ps1: don't use ENV GO_VERSION 
Modify hack/make.ps1 to use the version value used in
"FROM golang" statement.

While at it:
 1. Make search expression a bit more strict (use ^ to match at BOL only).
 2. Simplify by removing Get-Contents as Select-String can read files.

After this, ENV GO_VERSION can be removed from Dockerfile.
Unfortunately it can't be done in one commit as Windows CI
fails (presumably because Dockerfile is being modified in
place).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 6a2851332d5f86bb61a69d277f663f369377037b
Component: engine
 2018-08-15 12:16:39 +03:00
GordonTheTurtle c114e9c465 Merge component 'cli' from git@github.com:docker/cli master 2018-08-15 00:07:01 +00:00
Daniel Hiltgen 0b9441c0bb Bump API version to 1.39 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e05b657120a665a54715d3999cd18ae9a3f8d711
Component: engine
 2018-08-15 00:01:30 +00:00
Brian Goff a46d6924fa Merge pull request #1014 from AkihiroSuda/connhelper-sshonly 
support SSH connection
Upstream-commit: e92614a175
Component: cli
 2018-08-14 15:12:06 -07:00
GordonTheTurtle 2b0a9fe44a Merge component 'cli' from git@github.com:docker/cli master 2018-08-14 20:36:50 +00:00
GordonTheTurtle e37773a24d Merge component 'engine' from git@github.com:docker/engine master 2018-08-14 17:02:40 +00:00
Sebastiaan van Stijn d8d0aaab1d Merge pull request #1284 from adshmh/refactor-stack-ps-tests 
refactor stack ps tests 
Upstream-commit: 4d4392ba04
Component: cli
 2018-08-14 18:59:56 +02:00
Sebastiaan van Stijn 1eafd46aad Merge pull request #37412 from AzureCR/naduggar/logissue 
Select polling based watcher for docker log file watcher on Windows
Upstream-commit: 678d4b3a6d4cd7824d26592090b4dec507ce4bc2
Component: engine
 2018-08-14 14:40:44 +02:00
Sebastiaan van Stijn 0de052caee Merge pull request #37635 from kolyshkin/test-logs 
integration-cli: error logging improvements
Upstream-commit: 3c5eac362884bb60f9c7778966559d04b44cfb6a
Component: engine
 2018-08-14 14:38:34 +02:00
Kir Kolyshkin 0b5da3a767 integration-cli: error report improvements 
1. After running d.Cmd(), in case an error is returned, it makes sense
to print command output, as its stderr may contain a clue about what
went wrong. This is by no means complete, just as far as I could go.

2. In case the comment in c.Assert is a constant string, it's better
to provide it as a comment which will be printed.

3. An arbitrary string should not be passed on to a function expecting
%-style formatting. Use %s to fix this.

4. Print the output string before transformation, not after.

5. Unify the output format (drop "out:" prefix").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: ac038eab298eeecab55a62440de302e3bb3f4889
Component: engine
 2018-08-14 12:52:30 +03:00
Kir Kolyshkin fe821da2fd integration: use %s for check.Commentf() 
It is wrong to pass an arbitrary string to a function expecting
%-style formatting. One solution would be to replace any % with %%,
but it's easier to just do what this patch does.

Generated with:

for f in $(git grep -l 'check.Commentf(out)'); do \
	sed -i -e 's/check\.Commentf(out)/check.Commentf("%s", out)/g' $f; \
done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 83363fb2d4d97d952a0052d079faa8ae39aa20b6
Component: engine
 2018-08-14 10:45:39 +03:00
GordonTheTurtle b04c87dc5b Merge component 'engine' from git@github.com:docker/engine master 2018-08-13 05:01:54 +00:00
Yong Tang 96af87df0a Merge pull request #37443 from Projjol/new_names 
Add in two new names for names-generator
Upstream-commit: 1fd7e4c28d3a4a21c3540f03a045f96a4190b527
Component: engine
 2018-08-12 19:04:56 -07:00
Arash Deshmeh 0b69793ee3 refactor stack ps tests to table-driven 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 340e4ee8e5
Component: cli
 2018-08-10 15:13:45 -04:00
Tibor Vass 16b520e100 builder: do not cancel buildkit status request 
This fixes a bug when the build results in an error and instead of sending
the logs of the container to the client, it signals a cancelation.

The context should not be wired to the status request, as only the
build requests need to be canceled.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f1ef16c736b477be17f6bc1bce18d0958a87d840
Component: engine
 2018-08-10 17:29:32 +00:00
GordonTheTurtle af7228d929 Merge component 'cli' from git@github.com:docker/cli master 2018-08-10 12:36:59 +00:00
Silvin 70a91dd01b Merge pull request #1283 from adshmh/refactor-trust-revoke-tests 
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
Component: cli
 2018-08-10 11:03:58 +02:00
Vincent Demeester e3e25812ec Merge pull request #1280 from adshmh/refactor-trust-inspect-tests 
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
Component: cli
 2018-08-10 10:37:53 +02:00
Arash Deshmeh ea09ac3378 refactored trust revoke command unit tests to use table-driven style 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 984d76b9dd
Component: cli
 2018-08-09 15:58:54 -04:00
GordonTheTurtle f68f53a53c Merge component 'cli' from git@github.com:docker/cli master 2018-08-09 16:36:51 +00:00
Sebastiaan van Stijn e2e1350a4c Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list 
use sortorder library for sorting network list output
Upstream-commit: 6ef11c516d
Component: cli
 2018-08-09 12:05:55 +02:00
GordonTheTurtle ea9e6f1a60 Merge component 'engine' from git@github.com:docker/engine master 2018-08-09 01:03:02 +00:00
Akihiro Suda b552588bbc Merge pull request #37609 from seratch/fix-typos 
Fix the several typos detected by github.com/client9/misspell
Upstream-commit: 4122eb1a43a42c4c8b827b4d0fb3d6543f9f2c91
Component: engine
 2018-08-09 08:48:05 +09:00
GordonTheTurtle 2cb7dab3fc Merge component 'engine' from git@github.com:docker/engine master 2018-08-08 21:00:38 +00:00
Tibor Vass 71cb67c2af Merge pull request #37582 from andrewhsu/bk 
vndr containerd to a88b631, buildkit to e57eed4, and fsutil to b19464c
Upstream-commit: a3e78ca0c6a1a20c5ffeeaa51e3e0b4ff623a464
Component: engine
 2018-08-08 10:55:19 -07:00
Arash Deshmeh 64bf68b122 refactor trust inspect command unit tests to table-driven style 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: f8f0d72cf9
Component: cli
 2018-08-08 13:50:00 -04:00
Arash Deshmeh 7435e1c862 use sortorder lib for sorting the output of volume list command 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 5cc1f9006a
Component: cli
 2018-08-08 12:20:21 -04:00
Arash Deshmeh 73b3c56c30 use sortorder lib for sorting in trust package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 04bb3c770f
Component: cli
 2018-08-08 12:20:10 -04:00
Arash Deshmeh 21c2c41660 use sortorder lib for sorting network list output 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: a921313caf
Component: cli
 2018-08-08 12:06:59 -04:00
Kazuhiro Sera 71a3e53c36 Fix the several typos detected by github.com/client9/misspell 
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
 2018-08-09 00:45:00 +09:00
Tibor Vass 9e965fad85 build: change --console=[auto,false,true] to --progress=[auto,plain,tty] 
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.

In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: faeb8bb571
Component: cli
 2018-08-07 18:18:13 +00:00
GordonTheTurtle 5f75afe983 Merge branch 'master' of github.com:docker/docker-ce 2018-08-07 17:03:38 +00:00
GordonTheTurtle 53e0010b72 Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:37:00 +00:00
GordonTheTurtle ad843ef36b Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:32:36 +00:00
Sebastiaan van Stijn d098202034 Merge pull request #1277 from vdemeester/template-subtests-followup 
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
Component: cli
 2018-08-07 16:30:11 +02:00
Vincent Demeester 68e01b8ab7 Migrate TestExtractVariables to subtests… 
… as suggested in previous PR comment.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9cd7c1361c
Component: cli
 2018-08-07 16:06:13 +02:00
Ximo Guanter Gonzálbez a18736f217 Fix #28814 
Signed-off-by: Ximo Guanter Gonzálbez <joaquin.guantergonzalbez@telefonica.com>
Upstream-commit: ea65a0b1349b532e9d10d63835c751d291a7c0f4
Component: engine
 2018-08-07 10:20:13 +02:00
Tibor Vass a3a5617ab6 builder: fix compilation errors after vendoring 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
 2018-08-07 06:03:10 +00:00