37fcaf7a29
Resolve the docker Endpoint even if the client already exists. In that case the `TestDialStdio` e2e test had to be modified: the `--tls` option triggers an error since the endpoint resolution tries to read the `${DOCKER_CERT_PATH}/ca.pem` file which does not exist.
...
Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>
2019-03-13 14:18:41 +01:00
3b26cfce8b
Always initialize context store
...
Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>
2019-03-13 14:18:41 +01:00
d6a230606c
Merge pull request #1718 from ijc/dial-stdio-npipe-on-windows
...
dial-stdio: handle connections which lack CloseRead method.
2019-03-13 11:49:25 +01:00
81ac432cc2
Merge pull request #1700 from thaJeztah/update_engine
...
Update docker/docker 8aca18d, containerd v1.2.4
2019-03-12 10:41:51 -07:00
0449ad8d06
Revert "Disable `docker system dial-stdio` on Windows"
...
This reverts commit c41c23813c
2019-03-12 14:57:52 +00:00
186e7456ac
dial-stdio: Close the connection
...
This was leaking the fd.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-12 14:57:40 +00:00
8919bbf04d
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>
2019-03-12 14:52:42 +00:00
bf4a96e564
Merge pull request #1688 from luoyunpeng/optimize-blockIOTypecheck
...
use char to check blockIO type
2019-03-12 10:32:31 +01:00
6d2d597a6d
Merge pull request #1728 from ijc/e2e-handle-alpine-bump
...
Fixes for e2e testing after Alpine bump
2019-03-11 15:59:17 +01:00
0b0c57871a
e2e: avoid `usermod -p` by using `useradd`'s `--password` option
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-11 14:25:41 +00:00
e854a9cf96
e2e: Expand `useradd`'s `-m` otion into `--create-home`
...
... for improved readability
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-11 14:25:41 +00:00
5de2d9e8a9
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>
2019-03-11 14:25:19 +00:00
b86bff84b6
Merge pull request #1710 from ijc/no-dial-stdio-on-windows
...
Disable `docker system dial-stdio` on Windows
2019-03-11 15:14:23 +01:00
0bb397f9ef
use char to check blockIO type
...
Signed-off-by: Elliot Luo <956941328@qq.com>
2019-03-11 10:01:22 +08:00
fdb0ef7be0
Merge pull request #1720 from zappy-shu/harden-config-path
...
hardening config.Path() to disallow directory traversal
2019-03-10 21:04:08 +01:00
89dd14d665
Merge pull request #1693 from thaJeztah/upgrade_shellcheck_0.6.0
...
Upgrade shellcheck 0.6.0
2019-03-08 20:58:24 +01:00
ff51b0d77d
harden config.Path() to disallow directory traversal
...
Signed-off-by: Nick Adcock <nick.adcock@docker.com>
2019-03-07 14:40:53 +00:00
39c327ab93
Merge pull request #1717 from ry4nz/export-config
...
Export cli/command/config
2019-03-07 08:04:33 +01:00
f60369dfe6
Export cli/command/config
...
Signed-off-by: Ryan Zhang <ryan.zhang@docker.com>
2019-03-05 14:26:42 -08:00
79e1cabf17
Merge pull request #1680 from cquon/plugin_error_handling
...
Fix issue where plugin command error exit code is printed out
2019-03-05 09:22:47 +01:00
8f68971ede
Merge pull request #1701 from ijc/plugin-build-fixes
...
Fix cli-plugins build.
2019-03-05 09:10:08 +01:00
c41c23813c
Disable `docker system dial-stdio` on Windows
...
The `conn` here is `*winio.win32MessageBytePipe` which does not have a
`CloseRead` method (it does have `CloseWrite`) resulting in:
docker@WIN-NUC0 C:\Users\docker>.\docker-windows-amd64.exe system dial-stdio
the raw stream connection does not implement halfCloser
Also disable the path which uses this for cli-plugins on Windows.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-04 17:36:21 +00:00
38480d9a96
Use `$(DOCKER_RUN)` for cli plugins build.
...
Seems I rebased over b039db985a#1698 but here we switch to
using `$(DOCKER_RUN)`. This means that these rules now use
`$(DOCKER_RUN_NAME_OPTION)` and thus obey the `$(DOCKER_CLI_CONTAINER_NAME)`
variable.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-04 10:17:58 +00:00
8ddde26af6
Merge pull request #1702 from AkihiroSuda/connhelper-export
...
connhelper: export functions for other projects
2019-03-03 11:40:10 +01:00
05fd2a87dc
Update containerd 1.2.4 and dependencies
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:44:57 +01:00
087a7ee712
bump github.com/gorilla/mux v1.7.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:42:07 +01:00
0fc0015173
bump docker/docker to 8aca18d631f3f72d4c6e3dc01b6e5d468ad941b8
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:41:42 +01:00
dbe7afbd04
connhelper: export functions for other projects
...
Exposed functions are planned to be used by `buildctl`:
https://github.com/moby/buildkit/issues/769
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-03-02 21:11:49 +09:00
ee94f72e2c
Merge pull request #1698 from silvin-lubecki/fix-cross-dev-mounts
...
Fix unknown $(MOUNTS) variable in makefile plugins target
2019-03-01 18:48:25 +01:00
2c6b2ccbdd
Fix unknown $(MOUNTS) variable in makefile plugins target
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2019-02-28 11:56:13 +01:00
d871451049
Fix issue where plugin command error exit code is printed out
...
Signed-off-by: Corey Quon <corey.quon@docker.com>
2019-02-26 09:39:07 -08:00
2178fea84d
Merge pull request #1665 from jcrben/patch-1
...
Note caveat with detaching using key sequence
2019-02-26 16:56:31 +01:00
ff107b313a
Update to shellcheck v0.6.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-26 15:12:52 +01:00
388646eab0
Use official shellcheck image
...
This patch switches the shellcheck image to use the official image
from Docker Hub.
Note that this does not yet update shellcheck to the latest version (v0.5.x);
Shellcheck v0.4.7 added some new checks, which makes CI currently fail, so will
be done in a follow-up PR. Instead, the v0.4.6 version is used in this PR, which
is closest to the same version as was installed in the image before this change;
```
docker run --rm docker-cli-shell-validate shellcheck --version
ShellCheck - shell script analysis tool
version: 0.4.4
license: GNU General Public License, version 3
website: http://www.shellcheck.net
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-26 15:10:38 +01:00
69311b5ad9
Merge pull request #1691 from justincormack/nolibtool
...
Update PKCS11 library
2019-02-26 14:52:52 +01:00
9b837be8e2
Merge pull request #1689 from ijc/plugins-docker-system-info-format
...
Reformat the output of CLI plugins in `docker system info`
2019-02-26 14:51:39 +01:00
3174ca0e69
Merge pull request #1684 from thaJeztah/plugin_subcommand_detection
...
Show plugins as Management commands
2019-02-26 14:22:18 +01:00
cb3e55bf58
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>
2019-02-26 11:45:19 +00:00
f8c5f5d9b8
Show plugins as Management commands
...
Plugins are expected to be management commands ("docker <object> <verb>").
This patch modified the usage output to shown plugins in the "Management commands"
section.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-26 00:28:41 +01:00
3c2832637a
Reformat the output of CLI plugins in `docker system info`
...
This matches the `docker --help` output after 92013600f9
2019-02-25 13:13:51 +00:00
cdba45bd8b
Merge pull request #1652 from ijc/plugins-config
...
Add a field to the config file for plugin use.
2019-02-25 12:01:41 +01:00
11985c6250
Merge pull request #1675 from ulyssessouza/format-plugin-vendor-version-help
...
Reformat plugin's vendor position and add version on --help
2019-02-25 11:47:09 +01:00
90f0742984
Document the plugin field in the config file
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-02-25 10:38:48 +00:00
20439aa662
Simplify cli plugin config file entry
...
Make it a simple `map[string]string` for now.
Added a unit test for it.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-02-25 10:38:48 +00:00
4eb642be46
Add a field to the config file for plugin use.
...
This is a bit manual (as the unit test attests) so we may find we want to add
some helpers/accessors, but this is enough to let plugins use it and to
preserve the information through round-trips.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-02-25 10:38:48 +00:00
3ddb3133f5
Merge pull request #1686 from thaJeztah/max_replicas_completion
...
Bash completion: add '--replicas-max-per-node'
2019-02-22 13:00:37 -08:00
cd7d2dfe87
Bash completion: add '--replicas-max-per-node'
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-22 11:20:29 +01:00
f1de399a54
Merge pull request #1612 from olljanat/replicas-max-per-node-cli
...
Add support for maximum replicas per node without stack
2019-02-22 11:17:18 +01:00
f7f4d3bbb8
Add support for maximum replicas per node without stack
...
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2019-02-22 09:53:21 +02:00
35c39d3264
Merge pull request #1511 from wk8/wk8/small_makefile_tweaks
...
Make it possible to override the volume mounts and shell for the dev container
2019-02-21 11:06:10 -08:00
Jean-Christophe Sirot
Sebastiaan van Stijn
Tibor Vass
Ian Campbell
Silvin Lubecki
Elliot Luo
Vincent Demeester
Nick Adcock
Ryan Zhang
Sebastiaan van Stijn
Akihiro Suda
Silvin Lubecki
Corey Quon
Justin Cormack
Olli Janatuinen
Brian Goff