Commit Graph

5869 Commits

Author SHA1 Message Date
Olli Janatuinen 0704d9a031 Allow npipe volume type on stack file
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2018-09-27 18:47:20 +03:00
Silvin Lubecki 939fa90d22
Merge pull request #1393 from thaJeztah/update_docker_buildkit_containerd
Bump engine, containerd, and buildkit to match upstream
2018-09-26 15:55:28 +02:00
Sebastiaan van Stijn 1833bc5ff3
Bump docker/swarmkit to 9f271c2963d18a7c60d2c4001fb418ca4037df19
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:59 +02:00
Sebastiaan van Stijn 8cfd24049f
Bump buildkit and dependencies to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:48 +02:00
Sebastiaan van Stijn 3170e5b8a9
Bump etcd dependencies
etcd was updated to v3.3.9 in 8788a4804f, but
dependencies were not bumped. This bumps dependencies to the same versions as
was done upstream in moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:39 +02:00
Sebastiaan van Stijn 036b8f75e5
Bump containerd client to d97a907f7f781c0ab8340877d8e6b53cc7f1c2f6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:28 +02:00
Sebastiaan van Stijn 943a2d1065
Bump Microsoft/hcsshim to v0.7.3, Microsoft/go-winio to v0.4.11
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:20 +02:00
Sebastiaan van Stijn 5e5538ee79
Bump github.com/docker/docker to 9f296d1e6fccd9f73bae345e4aad4f3f6e92fdeb
Relevant changes:

- moby#37701 Add support for sysctl options in services
- moby#37780 pkg/progress: work around closing closed channel panic
- moby#37829 Update copyright years
- moby#37770 Windows: Go1.11: Use long path in TestBuildSymlinkBreakout

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:09 +02:00
Silvin Lubecki 7d313cf865
Merge pull request #1385 from dhiltgen/revamp_master
Forward port #1381 to master
2018-09-26 15:29:33 +02:00
Silvin Lubecki 23a8b6cbc5
Merge pull request #1392 from thaJeztah/fix_substitution_with_non_empty_value
Fix substitution with non-empty env-var
2018-09-26 15:17:09 +02:00
Sebastiaan van Stijn ec3daea021
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>
2018-09-25 22:20:25 +02:00
Daniel Hiltgen 7485ef6f60 Fix vendoring glitch
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit ec1812188f)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:43:33 -07:00
Daniel Hiltgen 2f23c97d17 Fix lint glitches
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 6004d74b1f)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:43:28 -07:00
Daniel Hiltgen ab6c0e1845 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>
(cherry picked from commit 0f22d7e295)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:43:19 -07:00
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
Akihiro Suda acbb0eb6da connhelper: try sending SIGTERM before SIGKILL
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-09-07 18:13:35 +09: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