Commit Graph

5648 Commits

Author SHA1 Message Date
f9629fed01 Fix panic in display only case for license
Prior refactoring passes missed a corner case.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: dee37936e5
Component: cli
2018-10-02 10:24:16 -07:00
becd9d2f22 Merge pull request #1406 from dhiltgen/revamp_18.09
Remove unused helath check func
Upstream-commit: 3e1a0bdc23
Component: cli
2018-10-02 11:26:36 +02:00
8fe3e73789 Remove unused helath check func
During the refactoring for 18.09 the activate/update flows no longer
restart the engine explicitly but let the user do that when they're ready,
so the health check logic is no longer required.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f2b2061cc3
Component: cli
2018-10-01 15:12:09 -07:00
6feb3a98d4 Merge pull request #1388 from dhiltgen/revamp_18.09
[18.09] Refine how metadata dir is handled
Upstream-commit: 5d3ab5bc0c
Component: cli
2018-09-28 14:23:12 -07:00
ff2d0e0b89 Refine how metadata dir is handled
This is a follow up PR to #1381 to address some of the review comments
we didn't get to.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: c12e23a4c1
Component: cli
2018-09-28 14:14:13 -07:00
a6c487557f Merge pull request #1387 from dhiltgen/activate_ux
[18.09] Expose licensing details before loading
Upstream-commit: aca3f2d382
Component: cli
2018-09-28 14:02:48 -07:00
fdf9f276f8 use gotest.tools/fs for TestActivateExpiredLicenseDryRun
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a7488d1bcd
Component: cli
2018-09-28 20:50:43 +00:00
cb4c2a9e5e Expose licensing details before loading
Help the user understand which license they're about
to load in case they have multiple licenses they need to
figure out.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 5a97a93ae1
Component: cli
2018-09-28 20:50:43 +00:00
c3605e497b Vendor bump of licensing lib
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 41910b6d68
Component: cli
2018-09-28 20:50:43 +00:00
939ed19be8 Merge pull request #1389 from mason-fish/fix-subscription-filter
[18.09] fix subscription filter
Upstream-commit: 1a087e87c9
Component: cli
2018-09-26 16:12:41 -07:00
5e51fc1169 Merge pull request #1394 from thaJeztah/18.09_backport_
[18.09] backport fix substitution with non-empty env-var
Upstream-commit: 0b11120060
Component: cli
2018-09-26 15:33:01 +02:00
1be325e42d Merge pull request #1342 from tonistiigi/1809-fix-os-race
[18.09] backport connhelper: fix cmd.Wait() race
Upstream-commit: e57b20642d
Component: cli
2018-09-26 15:30:00 +02:00
35e5a1ade4 Fix substitution with non-empty env-var
Due to a typo, substitution would not work if the given
environment-variable was set.

Given the following docker compose file;

```yaml
version: "3.7"

services:
  app:
    image: nginx:${version:-latest}
```

Deploying a stack with `$version` set would ignore the `$version`
environment variable, and use the default value instead;

```bash
version=alpine docker stack deploy -c docker-compose.yml foobar

Creating network foobar_default
Creating service foobar_app

docker service ls

ID                  NAME                MODE                REPLICAS            IMAGE               PORTS
rskkjxe6sm0w        foobar_app          replicated          1/1                 nginx:latest
```

This patch also fixes "soft default" not detecting empty environment variables,
only non-set environment variables.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ec3daea021)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b8702b8a9a
Component: cli
2018-09-26 15:20:15 +02:00
3632151436 fix subscription filter
Signed-off-by: Mason Fish <mason.fish@docker.com>
Upstream-commit: a31b20d7db
Component: cli
2018-09-24 16:56:05 -07:00
ec828168f7 Merge pull request #1386 from tiborvass/18.09-df-verbose-format-raw
[18.09] system/df: allow -v with --format
Upstream-commit: 5ba5678898
Component: cli
2018-09-22 00:25:21 -07:00
49102eef76 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>
(cherry picked from commit a90b99edfc)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9de1318e36
Component: cli
2018-09-22 01:33:03 +00:00
0cc0272882 Merge pull request #1381 from dhiltgen/revamp_18.09
[18.09] `docker engine` updates
Upstream-commit: 19e1ab273e
Component: cli
2018-09-21 15:12:54 -07:00
a7ed2532ff Fix vendoring glitch
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: ec1812188f
Component: cli
2018-09-21 13:16:34 -07:00
92a89516ee Fix lint glitches
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 6004d74b1f
Component: cli
2018-09-21 11:01:17 -07:00
ae721f13eb Merge pull request #1382 from thaJeztah/18.09_manifest-inspect-insecure-fix
[18.09] backport fix insecure manifest inspect with restrictive certs perms
Upstream-commit: e79e591ee9
Component: cli
2018-09-21 12:53:24 +02:00
f074e8a141 Remove metadata file before writing
The packages will deliver this as a link so lets make sure we don't
write through the link to the underlying packaged file.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 0f22d7e295
Component: cli
2018-09-20 18:00:46 -07:00
e5e1355bb7 Review comments
Address code review comemnts and purge additional dead code.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f250152bf4
Component: cli
2018-09-20 12:01:20 -07:00
622b5b7f2d 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>
(cherry picked from commit d57adbc034)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f9d666b057
Component: cli
2018-09-20 19:53:10 +02:00
1a085c96aa Refined engine implementations
Adapt the CLI to the host install model for 18.09.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 342afe44fb
Component: cli
2018-09-19 20:10:31 -07:00
2119c0b73f Install binaries on host for upgrade
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfec8027ed
Component: cli
2018-09-19 19:06:28 -07:00
4ba612a68b Merge pull request #1375 from thaJeztah/18.09_backport_importlcow
[18.09] backport LCOW: --platform on import (already in API)
Upstream-commit: 78c42cf031
Component: cli
2018-09-14 15:06:21 +02:00
a59415a939 LCOW: --platform on import (already in API)
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b55a0b681f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd2f13bed4
Component: cli
2018-09-14 14:26:39 +02:00
d660c7046d Merge pull request #1373 from thaJeztah/18.09_backport_move_test_function_in_there
[18.09] backport getEngineConfigFilePath is only used during test so moving it in test files for now.
Upstream-commit: 3b991ec615
Component: cli
2018-09-14 13:20:12 +02:00
b7897f6e93 Merge pull request #1374 from thaJeztah/18.09_backport_docs_fixes
[18.09] backport update usage for 'docker build' with '--progress' and '--secret' options
Upstream-commit: 34ea8bb5a5
Component: cli
2018-09-14 12:55:50 +02:00
4a4ca3a409 update usage for 'docker build' with '--progress' and '--secret' options
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 83ca55db7d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: afb17ec70b
Component: cli
2018-09-14 12:35:22 +02:00
c13580aaef getEngineConfigFilePath is only used during test…
… so moving it in test files for now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 37ca5d6813)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 62aed95bc1
Component: cli
2018-09-14 12:27:13 +02:00
017b0f6ba8 Merge pull request #1368 from thaJeztah/carry-1360-store_prefix
[18.09] Prefix engine repo with store
Upstream-commit: 649e4916bb
Component: cli
2018-09-13 08:24:45 +02:00
dccaa07396 Prefix engine repo with store
The official access point for the Q3 engine images will
be prefixed by store.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3597d75281
Component: cli
2018-09-12 13:43:04 +02:00
1dd82b9047 Merge pull request #1364 from thaJeztah/18.09-backport_contains-containerized
[18.09] backport: remove containerizedengine package dependency from docker/cli/command…
Upstream-commit: 5673816fec
Component: cli
2018-09-12 08:55:12 +02:00
9eec3ee5ff Merge pull request #1365 from thaJeztah/18.09-backport_engine-only-linux
[18.09] backport add `docker engine` commands only on Linux…
Upstream-commit: a8c69c8287
Component: cli
2018-09-11 18:04:57 +02:00
4c421251cb 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>
(cherry picked from commit 2d344b2f61)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fc3dc8f058
Component: cli
2018-09-11 17:01:02 +02:00
7c9cac74cd 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>
(cherry picked from commit a3a955f204)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2a46a3d46c
Component: cli
2018-09-11 16:57:54 +02:00
df21fd28e1 connhelper: fix cmd.Wait() race
Fix #1336

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit a22853e64d)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b2cf18ac2e
Component: cli
2018-09-05 16:03:41 -07:00
cceba0654c Merge pull request #1339 from andrewhsu/vr
[18.09] vndr docker/docker to docker/engine d2ecc7b
Upstream-commit: 44371c7c34
Component: cli
2018-09-05 11:43:09 -07:00
3fb39207b2 vndr docker/docker to docker/engine d2ecc7b
And update the associated packages that have also updated from
docker/docker vendor.conf.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 4e6798794d
Component: cli
2018-09-05 17:35:51 +00:00
0512e4dbc2 Merge pull request #1334 from tiborvass/18.09-cmd-builder-prune-with-options
[18.09] build: add options to builder prune
Upstream-commit: d8aefad94a
Component: cli
2018-09-04 22:35:23 -07:00
15c2034539 system df: show table output for build cache
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ca608c2302)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3c37d6a034
Component: cli
2018-09-05 03:33:30 +00:00
d62dfa0a57 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>
(cherry picked from commit c806eb49c9)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9d43f1ed48
Component: cli
2018-09-05 03:33:30 +00:00
3d47abb1d1 Merge pull request #1322 from thaJeztah/18.09_backport_bump_kube_deps
[18.09] backport: bump kube dependency to 1.11.2
Upstream-commit: a818677813
Component: cli
2018-08-29 17:56:26 +02:00
593e7b7d05 Merge pull request #1323 from thaJeztah/18.09_backport_bump_golang_1.10.4
[18.09] backport: bump Go to 1.10.4
Upstream-commit: c204959687
Component: cli
2018-08-29 15:32:30 +02:00
199effc58c Bump Go to 1.10.4
Includes fixes to the go command, linker, and the net/http, mime/multipart,
ld/macho, bytes, and strings packages. See the Go 1.10.4 milestone on the
issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.10.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 44ca0901d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 76c09259db
Component: cli
2018-08-29 15:19:34 +02:00
6378b2a9e2 Bump kube dependency to 1.11.2
Bump our kube dependencies to the latest patch
level for kube 1.11.

Signed-off-by: Marcus Martins <marcus@docker.com>
(cherry picked from commit c67e05796b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0efb62cab1
Component: cli
2018-08-29 14:59:20 +02:00
9823e5c1f0 Merge pull request #1313 from dhiltgen/product_license
[18.09] Expose product license in info output
Upstream-commit: 8789e93d6e
Component: cli
2018-08-28 21:05:09 -07:00
eaabc7f477 Merge pull request #1312 from dhiltgen/dual_keys
[18.09] Add support for multiple signing keys
Upstream-commit: 0ee05a6353
Component: cli
2018-08-28 20:51:22 -07:00
68a6e99be4 Expose product license in info output
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 68be7cb376
Component: cli
2018-08-28 20:10:09 -07:00