toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,749 Commits 3 Branches 295 Tags
1b7a5a4e5aa2a41f43b046d3f792f898e32f9634
Commit Graph
5749 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu 1b7a5a4e5a Merge pull request #1778 from thaJeztah/18.09_bump_engine 
[18.09] bump engine 200b524eff60a9c95a22bc2518042ac2ff617d07 (18.09 branch)
Upstream-commit: 57b27434ea
Component: cli
 2019-03-27 08:28:02 -07:00
Sebastiaan van Stijn b3b20effb4 bump engine 200b524eff60a9c95a22bc2518042ac2ff617d07 (18.09 branch) 
relevant changes;

- moby/moby#38006 / docker/engine#114 client: use io.LimitedReader for reading HTTP error
- moby/moby#38634 / docker/engine#167 pkg/archive:CopyTo(): fix for long dest filename
  - fixes docker/for-linux#484 for 18.09
- moby/moby#38944 / docker/engine#183 gitutils: add validation for ref
- moby/moby#37780 / docker/engine#55 pkg/progress: work around closing closed channel panic
  - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 010c234a0d
Component: cli
 2019-03-27 10:08:23 +01:00
Tibor Vass b13cfeb5ba Merge pull request #1733 from thaJeztah/18.09_backport_dial_stdio_npipe_on_windows 
[18.09 backport] dial-stdio: handle connections which lack CloseRead method
Upstream-commit: f6693b0b25
Component: cli
 2019-03-21 14:35:47 -07:00
Sebastiaan van Stijn 38ac401e28 Merge pull request #1744 from thaJeztah/18.09_backport_docs_fixes 
[18.09 backport] various docs fixes
Upstream-commit: ed16a3136b
Component: cli
 2019-03-18 17:36:26 +01:00
Silvin Lubecki 7a40ed937a Merge pull request #1741 from thaJeztah/18.09_backport_fix_plugin_test 
[18.09 backport] Fix: plugin-tests discarding current environment
Upstream-commit: e63ac0ea35
Component: cli
 2019-03-18 14:47:32 +01:00
Silvin Lubecki e9e7044d89 Add some spaces for cosmetics and readability reasons. 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 8401c81b46)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c1a4358ea4
Component: cli
 2019-03-18 13:52:13 +01:00
Eric Curtin 5def8bca28 Add exit status to docker exec manpage 
There's little way of knowing what each exit status means at present
because it's not documented. I'm assuming they are the same as docker
run.

Signed-off-by: Eric Curtin <ericcurtin17@gmail.com>
(cherry picked from commit 23670968cc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27ab7cc3d6
Component: cli
 2019-03-18 11:16:13 +01:00
coop-cloud 8cae313dd6 Corrected max-file option - was incorrectly spelt as max-files 
Signed-off-by: Steve Richards <steve.richards@docker.com>
(cherry picked from commit 04f88005c9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 74bd5f143f
Component: cli
 2019-03-18 11:16:11 +01:00
Ben Creasy 3adaef1e74 Note caveat with detaching using key sequence 
This has come up a few times, e.g. https://github.com/moby/moby/issues/20864 and https://github.com/moby/moby/issues/35491

Signed-off-by: Ben Creasy <ben@bencreasy.com>
(cherry picked from commit 767b25fc52)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8dc400713f
Component: cli
 2019-03-18 11:16:08 +01:00
Michael Käufl d6ea168f88 Fix typos 
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
(cherry picked from commit 0e469c1d1d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 543f9b32ee
Component: cli
 2019-03-18 11:16:05 +01:00
Ryan Wilson-Perkin 0ddc0b1b54 Fix small typo 
Noticed a typo in this markdown file: "instead" instead of "in stead"

Signed-off-by: Ryan Wilson-Perkin <ryanwilsonperkin@gmail.com>
(cherry picked from commit 7a9fc782c5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1d314f2227
Component: cli
 2019-03-18 11:15:59 +01:00
Sebastiaan van Stijn ab07868a3f Improve docker image rm reference docs 
Copies the improved description from the man page
to the online reference docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 89bc5fbbae)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 275ab1f063
Component: cli
 2019-03-18 11:15:57 +01:00
Stefan Scherer 2b74693bae Update process isolation description for older Windows 10 versions 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
(cherry picked from commit 7229920e2e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f6ab11ff4
Component: cli
 2019-03-18 11:15:55 +01:00
zhoulin xie 8fe68b3c25 Fix some typos in manifest.md 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
(cherry picked from commit abe1bb9757)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 537309a548
Component: cli
 2019-03-18 11:15:52 +01:00
Sebastiaan van Stijn 0e8ded3923 docs: add missing ID placeholder for docker node ps 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 24018b9ffd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 08714b4579
Component: cli
 2019-03-18 11:15:50 +01:00
Frederic Hemberger c81fbf531f docs(metrics-addr): Use port 9323, allocated for Docker in prometheus 
Signed-off-by: Frederic Hemberger <mail@frederic-hemberger.de>
(cherry picked from commit 89aa2cf9f6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 789a15bc73
Component: cli
 2019-03-18 11:15:48 +01:00
Anne Henmi e0cf2f4f92 Fixed typo. 
Signed-off-by: Anne Henmi <anne.henmi@docker.com>
(cherry picked from commit 4aecd8bda1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce12ac2d14
Component: cli
 2019-03-18 11:15:45 +01:00
Nir Soffer 3803869429 Replace environmental with environment 
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
(cherry picked from commit f1f3d3be17)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4c94a0af75
Component: cli
 2019-03-18 11:15:43 +01:00
Filip Jareš 733325e26f Improve docker image rm documentation 
The `docker image rm` command can be used not only
to remove images but also remove tags.

This update improves the documentation to make
this clear.

Signed-off-by: Filip Jareš <filipjares@gmail.com>
(cherry picked from commit 2ba9601ef1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0717f261ed
Component: cli
 2019-03-18 11:15:39 +01:00
Sebastiaan van Stijn 2c6914129c Fix: plugin-tests discarding current environment 
By default, exec uses the environment of the current process, however,
if `exec.Env` is not `nil`, the environment is discarded:

https://github.com/golang/go/blob/e73f4894949c4ced611881329ff8f37805152585/src/os/exec/exec.go#L57-L60

> If Env is nil, the new process uses the current process's environment.

When adding a new environment variable, prepend the current environment,
to make sure it is not discarded.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6c4fbb7738)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fc8717799f
Component: cli
 2019-03-17 15:47:28 +01:00
Silvin Lubecki 8845519dce Merge pull request #1734 from thaJeztah/18.09_backport_fix_test_for_go_1.12 
[18.09 backport] Fix test for Go 1.12.x
Upstream-commit: 76f4876129
Component: cli
 2019-03-14 16:55:40 +01:00
Sebastiaan van Stijn ea47598cf6 Fix test for Go 1.12.x 
After switching to Go 1.12, the format-string causes an error;

```
=== Errors
cli/config/config_test.go:154:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:217:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:253:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:288:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:435:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:448:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile

DONE 1115 tests, 2 skipped, 6 errors in 215.984s
make: *** [Makefile:22: test-coverage] Error 2
Exited with code 2
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4877fb225)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7ea48a16e3
Component: cli
 2019-03-13 22:27:00 +01:00
Ian Campbell 9d70293b5b dial-stdio: Close the connection 
This was leaking the fd.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 186e7456ac)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 75e9075591
Component: cli
 2019-03-13 11:54:11 +01:00
Ian Campbell c2cf227965 dial-stdio: handle connections which lack CloseRead method. 
This happens on Windows when dialing a named pipe (a path which is used by CLI
plugins), in that case some debugging shows:

    DEBU[0000] conn is a *winio.win32MessageBytePipe
    DEBU[0000] conn is a halfReadCloser: false
    DEBU[0000] conn is a halfWriteCloser: true
    the raw stream connection does not implement halfCloser
In such cases we can simply wrap with a nop function since closing for read
isn't too critical.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 8919bbf04d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69e1094f5a
Component: cli
 2019-03-13 11:53:58 +01:00
Vincent Demeester 4e69571cff Merge pull request #1729 from thaJeztah/18.09_backport_e2e_handle_alpine_bump 
[18.09 backport] Fixes for e2e testing after Alpine bump
Upstream-commit: 890e29da87
Component: cli
 2019-03-12 13:01:46 +01:00
Ian Campbell 35a6ca7054 e2e: avoid usermod -p by using useradd's --password option 
Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 0b0c57871a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 78d52ec5d4
Component: cli
 2019-03-12 10:36:15 +01:00
Ian Campbell e0218c5780 e2e: Expand useradd's -m otion into --create-home 
... for improved readability

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit e854a9cf96)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c0bbca75af
Component: cli
 2019-03-12 10:36:03 +01:00
Ian Campbell ba2b4c0c65 e2e Use useradd's --shell option 
... in preference to `chsh`, since in recent alpine 3.9.2 images that can fail
with:

    Password: chsh: PAM: Authentication token manipulation error

Which seems to relate to the use of `!` as the password for `root` in `/etc/shadow`gq

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 5de2d9e8a9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b666e9a090
Component: cli
 2019-03-12 10:35:23 +01:00
Andrew Hsu eca25928d3 Merge pull request #1694 from thaJeztah/18.09_backport_nolibtool 
[18.09 backport] Update PKCS11 library
Upstream-commit: 9352be5341
Component: cli
 2019-02-27 08:39:46 -08:00
Justin Cormack fe586e6b03 Update PKCS11 library 
The new version no longer links to libltdl which simplifies build
and dependencies.

See https://github.com/theupdateframework/notary/pull/1434

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit cb3e55bf58)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b4f607fb4f
Component: cli
 2019-02-26 13:17:22 +01:00
Sebastiaan van Stijn 22e12bdcfc Merge pull request #1634 from thaJeztah/18.09_bump_golang_1.10.8 
[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
Upstream-commit: af2647d55b
Component: cli
 2019-01-24 14:27:59 +01:00
Sebastiaan van Stijn 37fd1a0d0a [18.09] Bump Golang 1.10.8 (CVE-2019-6486) 
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c71aa11c0a
Component: cli
 2019-01-24 02:07:03 +01:00
Tibor Vass c6a63b52bb Merge pull request #1580 from thaJeztah/18.09_backport_e2e-invocation-nit 
[18.09 backport] e2e updates
Upstream-commit: 336b2a5cac
Component: cli
 2018-12-19 14:20:03 +01:00
Ian Campbell 7e7a37e63e e2e: assign a default value of 0 to DOCKERD_EXPERIMENTAL 
Currently running the e2e tests produces a warning/error:

    $ make -f docker.Makefile test-e2e
    «...»
    docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-cli-e2e
    ./scripts/test/e2e/run: line 20: test: : integer expression expected

This is from:

    test "${DOCKERD_EXPERIMENTAL:-}" -eq "1" && «...»

Where `${DOCKERD_EXPERIMENTAL:-}` expands to the empty string, resulting in
`test "" -eq "1"` which produces the warning. This error is enough to trigger
the short-circuiting behaviour of `&&` so the result is as expected, but fix
the issue nonetheless by provdiing a default `0`.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 4f483276cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c462e06fcd
Component: cli
 2018-12-17 17:23:04 +01:00
Akihiro Suda 130caf6e0e connhelper: add e2e 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 9b148db87a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 719508a935
Component: cli
 2018-12-17 17:22:58 +01:00
Andrew Hsu fe860b72c7 Merge pull request #1575 from thaJeztah/bump_golang_1.10.6 
[18.09] Bump Golang 1.10.6 (CVE-2018-16875)
Upstream-commit: 2fa3aae9ed
Component: cli
 2018-12-14 20:56:04 +00:00
Sebastiaan van Stijn c86a836fc4 Bump Golang 1.10.6 (CVE-2018-16875) 
go1.10.6 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.10.6 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.10.6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3a10aaed
Component: cli
 2018-12-14 01:41:33 +01:00
Andrew Hsu 6e20a0f6df Merge pull request #1567 from thaJeztah/18.09_backport_fix_panic_on_update 
[18.09 backport] Fix panic (npe) when updating service limits/reservations
Upstream-commit: 3ee6755815
Component: cli
 2018-12-13 10:39:37 +00:00
Sebastiaan van Stijn 055b2b5a9f Fix panic (npe) when updating service limits/reservations 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 579bb91853)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 16349f6e33
Component: cli
 2018-12-13 02:22:43 +01:00
Brian Goff 6290aed85c Merge pull request #1554 from thaJeztah/18.09_backport_completion-import--platform 
[18.09 backport] Add bash completion for `import --platform`
Upstream-commit: 2aa77af30f
Component: cli
 2018-12-07 13:10:27 -08:00
Brian Goff 4dce161c07 Merge pull request #1553 from thaJeztah/18.09_backport_completion-log-driver-local 
[18.09 backport] Add bash completion for "local" log driver
Upstream-commit: 456c1ce695
Component: cli
 2018-12-07 13:10:06 -08:00
Harald Albers 0cbda9f762 Add bash completion for import --platform 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e0fe546c37)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bcadc9061c
Component: cli
 2018-12-07 20:08:35 +01:00
Harald Albers f0885d1fab Add bash completion for "local" log driver 
Ref: https://github.com/moby/moby/pull/37092

Also adds log-opt `compress` to json-file log driver because this was
also added in the referenced PR.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit c59038b15c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e05745b4a5
Component: cli
 2018-12-07 20:05:08 +01:00
Sebastiaan van Stijn 72b3a61238 Merge pull request #1552 from thaJeztah/18.09_backport_fix_filter_panic 
[18.09 backport] Fix panic when pruning images with label-filter
Upstream-commit: b6ecef353f
Component: cli
 2018-12-07 19:29:32 +01:00
Sebastiaan van Stijn 1a759e5769 Fix panic when pruning images with label-filter 
Before this change:

    docker image prune --force --filter "label=foobar"
    panic: assignment to entry in nil map

    goroutine 1 [running]:
    github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters.Args.Add(...)
    /go/src/github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters/parse.go:167
    github.com/docker/cli/cli/command/image.runPrune(0x1db3a20, 0xc000344cf0, 0x16e0001, 0xc00015e600, 0x4, 0x3, 0xc00024e160, 0xc000545c70, 0x5ab4b5)
    /go/src/github.com/docker/cli/cli/command/image/prune.go:79 +0xbaf
    github.com/docker/cli/cli/command/image.NewPruneCommand.func1(0xc00029ef00, 0xc0004a8180, 0x0, 0x3, 0x0, 0x0)
    /go/src/github.com/docker/cli/cli/command/image/prune.go:32 +0x64
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).execute(0xc00029ef00, 0xc000038210, 0x3, 0x3, 0xc00029ef00, 0xc000038210)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:762 +0x473
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).ExecuteC(0xc000127180, 0xc000272770, 0x1836ce0, 0xc000272780)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:852 +0x2fd
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).Execute(0xc000127180, 0xc000127180, 0x1d60880)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:800 +0x2b
    main.main()
    /go/src/github.com/docker/cli/cmd/docker/docker.go:180 +0xdc

With this patch applied:

    docker image prune --force --filter "label=foobar"
    Total reclaimed space: 0B

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e1dd5bca4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e380ddaddf
Component: cli
 2018-12-07 17:58:38 +01:00
Andrew Hsu 66abfda9b2 Merge pull request #1542 from thaJeztah/18.09_backport_completion_cli_experimental 
[18.09 backport] Add bash completion for experimental CLI commands (manifest)
Upstream-commit: 12834eeff6
Component: cli
 2018-12-03 13:34:56 -08:00
Andrew Hsu be73976052 Merge pull request #1544 from thaJeztah/18.09_bump_go_to_1.10.5 
[18.09] Bump Go to 1.10.5
Upstream-commit: bb46da9fba
Component: cli
 2018-11-30 14:03:12 -08:00
Sebastiaan van Stijn 9ff11286df Bump Go to 1.10.5 
go1.10.5 (released 2018/11/02) includes fixes to the go command, linker,
runtime and the database/sql package. See the milestone on the issue
tracker for details:

List of changes; https://github.com/golang/go/issues?q=milestone%3AGo1.10.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 871d24d3fc
Component: cli
 2018-11-30 21:59:54 +01:00
Andrew Hsu da117f6859 Merge pull request #1540 from thaJeztah/18.09_backport_fix_flags_in_usage 
[18.09 backport] Fix yamldocs outputing `[flags]` in usage output
Upstream-commit: 61a9096b8d
Component: cli
 2018-11-29 13:26:27 -08:00
Harald Albers 280488aa00 Add bash completion for manifest command family 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 0fb4256a00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2ac475cf97
Component: cli
 2018-11-29 17:15:06 +01:00