Daniel Hiltgen
b7ec4a42d9
Review comments
...
Address code review comemnts and purge additional dead code.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit f250152bf4
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:43:00 -07:00
Daniel Hiltgen
f07f51f4c8
Refined engine implementations
...
Adapt the CLI to the host install model for 18.09.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 342afe44fb
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:41:25 -07:00
Michael Crosby
eacb812c26
Install binaries on host for upgrade
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit cfec8027ed
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:40:35 -07:00
Vincent Demeester
54c19e67f6
Merge pull request #1378 from clnperez/manifest-inspect-insecure-fix
...
fix insecure manifest inspect with restrictive certs perms
2018-09-20 18:57:30 +02:00
Christy Norman
d57adbc034
fix insecure manifest inspect with restrictive certs perms
...
If, for some reason, the certs directory has permissions that are
inaccessible by docker, we should still be able to fetch manifests using
the `insecure` flag.
Since the cli doesn't access the engine's list of insecure registries,
the registry client should make a singleton list of the registry being queried with the
`insecure` flag.
Closes #1358
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
2018-09-20 10:51:29 -05:00
Silvin Lubecki
b23272f34d
Merge pull request #1287 from adshmh/refactor-stack-list-unit-tests
...
refactor stack list command unit tests to table-driven
2018-09-20 14:26:01 +02:00
Arash Deshmeh
e9dc2293b1
refactor stack list command unit tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-09-19 22:13:03 -04:00
Sebastiaan van Stijn
3993346fc6
Merge pull request #1377 from adshmh/migrate-TestExportContainerWithOutputAndImportImage-from-moby
...
add a unit test to cover container export command output file option
2018-09-19 20:23:53 +02:00
Arash Deshmeh
fc1e11d46a
moved integration test TestExportContainerWithOutputAndImportImage from moby/moby to docker/cli.
...
The integration test TestExportContainerWithOutputAndImportImage in moby/moby is the same as TestExportContainerAndImportImage,
except for the output file option. Adding a unit test to cover the output file option of the export command here allows
the removal of the redundant integration test TestExportContainerWithOutputAndImportImage.
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-09-18 12:30:49 -04:00
Sebastiaan van Stijn
b4180e8757
Merge pull request #1371 from jhowardmsft/jjh/importlcow
...
LCOW: --platform on import (already in API)
2018-09-14 13:00:20 +02:00
Sebastiaan van Stijn
4ea2f9d386
Merge pull request #1324 from dhiltgen/dual_keys_master
...
Add support for multiple signing keys
2018-09-14 12:41:55 +02:00
Vincent Demeester
a900ba8aef
Merge pull request #1370 from tiborvass/df-verbose-format-raw
...
system/df: allow -v with --format
2018-09-14 11:41:23 +02:00
Tibor Vass
a90b99edfc
system/df: allow -v with --format
...
This allows to provide more information for build cache disk usage.
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-13 23:14:58 +00:00
John Howard
b55a0b681f
LCOW: --platform on import (already in API)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 15:04:04 -07:00
Silvin Lubecki
c3f2d78178
Merge pull request #1309 from thaJeztah/bump_master_version
...
Bump version to 19.03.0-dev
2018-09-13 23:54:04 +02:00
Sebastiaan van Stijn
94efcf4886
Merge pull request #1351 from mirake/fix-typos-filesytem
...
Typo fix: filesytem -> filesystem
2018-09-12 17:37:44 +02:00
Rui Cao
2eb95909ee
Typo fix: filesytem -> filesystem
...
Signed-off-by: Rui Cao <ruicao@alauda.io>
2018-09-12 23:02:32 +08:00
Sebastiaan van Stijn
1921a6c051
Merge pull request #1354 from nashasha1/fix/some-typo
...
Fix some typo
2018-09-12 14:53:38 +02:00
Sebastiaan van Stijn
bd906df601
Merge pull request #1352 from Lihua93/fix/typo
...
Typo fix
2018-09-12 14:28:05 +02:00
Sebastiaan van Stijn
82dff32bb4
Merge pull request #1362 from vdemeester/engine-only-linux
...
Add `docker engine` commands only on Linux…
2018-09-11 16:52:01 +02:00
Silvin Lubecki
2eb9b0cba2
Merge pull request #1361 from vdemeester/contains-containerized
...
Remove containerizedengine package dependency from docker/cli/command…
2018-09-11 15:54:13 +02:00
Vincent Demeester
a3a955f204
Add `docker engine` commands only on Linux…
...
… this is, for now, the only platform that is supported
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-09-11 15:23:22 +02:00
Vincent Demeester
2d344b2f61
Remove containerizedengine package dependency from docker/cli/command…
...
… this removes a whole lot of dependencies from people depending on docker/cli…
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-09-11 14:46:30 +02:00
Sebastiaan van Stijn
11ef349c58
Merge pull request #1326 from shin-/compose-json-annotations
...
Allow marshalling of Compose config to JSON
2018-09-11 14:40:21 +02:00
Sebastiaan van Stijn
7fa9b4babf
Bump version to 19.03.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-11 13:06:49 +02:00
Sebastiaan van Stijn
00e6843118
Merge pull request #1359 from tsuna/master
...
cli/config/configfile: Atomically rewrite the config file when saving.
2018-09-11 12:27:47 +02:00
Benoit Sigoure
7e9e2c10bc
cli/config/configfile: Atomically rewrite the config file when saving.
...
The config file was being truncated first, which created a window during
which it was empty, causing concurrent uses of the `docker` command to
potentially fail with:
WARNING: Error loading config file: /var/lib/jenkins/.docker/config.json: EOF
Error response from daemon: Get https://registry/v2/foo/manifests/latest : no basic auth credentials
Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
2018-09-10 13:43:24 -07:00
Joffrey F
e7788d6f9a
Allow marshalling of Compose config to JSON
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-10 11:16:05 -07:00
Tibor Vass
8ec21567a7
Merge pull request #1353 from tossmilestone/fix-typos
...
Fix 'wether'->'whether'
2018-09-08 19:58:49 -07:00
Xiaodong Zhang
f8e04011e4
Fix some typo
...
Signed-off-by: Xiaodong Zhang <a4012017@sina.com>
2018-09-07 17:18:00 +08:00
Xiaoxi He
2e0d87a247
Fix 'wether'->'whether'
...
Signed-off-by: Xiaoxi He <xxhe@alauda.io>
2018-09-07 16:26:18 +08:00
Lihua Tang
ca5e453180
Typo fix
...
Signed-off-by: Lihua Tang <lhtang@alauda.io>
2018-09-07 13:28:02 +08:00
Sebastiaan van Stijn
ce4a9f8311
Merge pull request #1314 from AntaresS/update-docs
...
update docs with currently supported features options
2018-09-06 21:58:23 +01:00
Andrew Hsu
9ad19d2266
Merge pull request #1329 from AntaresS/update-build-command-docs
...
update usage for 'docker build' with '--progress' and '--secret' options
2018-09-06 13:49:45 -07:00
Andrew Hsu
561c47f777
Merge pull request #1341 from andrewhsu/ven
...
[master] vndr docker/docker to 53e55db
2018-09-05 18:07:02 -07:00
Andrew Hsu
f6af8b3dfb
vndr docker/docker to 53e55db
...
And update the associated packages that have also updated from
docker/docker vendor.conf.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-09-06 00:44:39 +00:00
Tibor Vass
612673dd01
Merge pull request #1340 from AkihiroSuda/fix-os-race
...
connhelper: fix cmd.Wait() race
2018-09-05 15:59:37 -07:00
Akihiro Suda
a22853e64d
connhelper: fix cmd.Wait() race
...
Fix #1336
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-09-06 01:28:50 +09:00
Tibor Vass
0198955105
Merge pull request #1327 from tiborvass/cmd-builder-prune-with-options
...
build: add options to builder prune
2018-09-04 22:35:11 -07:00
Tibor Vass
ca608c2302
system df: show table output for build cache
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-05 03:31:40 +00:00
Tibor Vass
c806eb49c9
build: add options to builder prune
...
This patch adds --filter, --keep-storage, --all and --force to builder prune.
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-05 00:01:16 +00:00
Sebastiaan van Stijn
3ea56aa0ca
Merge pull request #1191 from adshmh/add-unit-tests-to-plugin-inspect-command
...
add unit tests to plugin inspect command
2018-08-31 14:39:58 +02:00
Anda Xu
83ca55db7d
update usage for 'docker build' with '--progress' and '--secret' options
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-30 17:50:14 -07:00
Anda Xu
d656706678
update docs with current supported features options
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-30 16:49:37 -07:00
Silvin Lubecki
1546d71de5
Merge pull request #1098 from dhiltgen/long_help
...
Show long help message when defined
2018-08-30 18:07:10 +02:00
Arash Deshmeh
14b696a297
added unit tests to plugin inspect command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-29 16:48:43 -04:00
Daniel Hiltgen
49e0821162
Add support for multiple signing keys
...
Basic enterprise licenses and platform license keys will be signed with
two different keys in the upcoming release. This adds support for the
CLI to support both variants.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 0fb6bb35a4
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-29 07:38:27 -07:00
Daniel Hiltgen
e755349143
Vendor bump for licensing library to support multiple signing keys
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 264ee43c2a
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-29 07:38:19 -07:00
Silvin Lubecki
deb84a9e4e
Merge pull request #1315 from thaJeztah/bump_golang_1.10.4
...
Bump Go to 1.10.4
2018-08-29 15:09:58 +02:00
Sebastiaan van Stijn
ead40ca6b4
Merge pull request #1319 from dhiltgen/fix_progress_master
...
Fix progress reporting for containerd pulls
2018-08-29 12:58:37 +02:00