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
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
Harald Albers
0fb4256a00
Add bash completion for `manifest` command family
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-30 08:54:49 +02:00
Harald Albers
a183c952c6
Add support for experimental cli features to bash completion
...
This is needed for implementing bash completion for the `docker manifest`
command family.
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-30 08:54:49 +02:00
Harald Albers
564d4da06e
Refactor usage of `docker version` in bash completion
...
This preapares bash completion for more context sensitivity:
- experimental cli features
- orchestrator specific features
Also renames _daemon_ to _server_ where used in context of `docker version`
because the fields there are grouped unter _Server_.
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-30 08:54:49 +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
60551c477d
Expose product license in info output
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 68be7cb376
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-29 07:42:32 -07: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
Sebastiaan van Stijn
dbdd4d7052
Merge pull request #1321 from marcusmartins/bump_kube_deps
...
Bump kube dependency to 1.11.2
2018-08-29 10:12:58 +02:00
Marcus Martins
c67e05796b
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>
2018-08-28 18:13:22 -07:00
Daniel Hiltgen
03924bc439
Fix progress reporting for containerd pulls
...
During refactoring of the implementation PR progress reporting
was broken. This gets the progress reporting back in action.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 7f4c842e8a
)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-28 16:27:53 -07:00
Sebastiaan van Stijn
44ca0901d1
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>
2018-08-28 12:08:52 +02:00
Vincent Demeester
6dbe8ea3a3
Merge pull request #1307 from AntaresS/update-docs
...
update docs with the new features option in daemon.json
2018-08-24 08:41:15 +02:00
Anda Xu
3e0b0a6692
update docs with the new features option in daemon.json
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-23 13:46:29 -07:00
Aleksa Sarai
2d7091aaeb
man: obey SOURCE_DATE_EPOCH when generating man pages
...
Previously our man pages included the current time each time they were
generated. This causes an issue for reproducible builds, since each
re-build of a package that includes the man pages will have different
times listed in the man pages.
To fix this, add support for SOURCE_DATE_EPOCH (which is a standardised
packaging environment variable, designed to be used specifically for
this purpose[1]). spf13/cobra doesn't support this natively yet (though
I will push a patch for that as well), but it's simpler to fix it
directly in docker/cli.
[1]: https://reproducible-builds.org/specs/source-date-epoch/
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2018-08-23 21:36:05 +10:00
Silvin Lubecki
022fd9b967
Merge pull request #1304 from vdemeester/move-test-function-in-there
...
getEngineConfigFilePath is only used during test…
2018-08-22 17:08:01 +02:00
Vincent Demeester
37ca5d6813
getEngineConfigFilePath is only used during test…
...
… so moving it in test files for now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-22 15:32:32 +02:00
Sebastiaan van Stijn
08cf36daa6
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
2018-08-22 00:57:27 +01:00