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
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
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
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
e7788d6f9a
Allow marshalling of Compose config to JSON
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-10 11:16:05 -07:00
8ec21567a7
Merge pull request #1353 from tossmilestone/fix-typos
...
Fix 'wether'->'whether'
2018-09-08 19:58:49 -07:00
f8e04011e4
Fix some typo
...
Signed-off-by: Xiaodong Zhang <a4012017@sina.com>
2018-09-07 17:18:00 +08:00
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
2e0d87a247
Fix 'wether'->'whether'
...
Signed-off-by: Xiaoxi He <xxhe@alauda.io>
2018-09-07 16:26:18 +08:00
ca5e453180
Typo fix
...
Signed-off-by: Lihua Tang <lhtang@alauda.io>
2018-09-07 13:28:02 +08:00
ce4a9f8311
Merge pull request #1314 from AntaresS/update-docs
...
update docs with currently supported features options
2018-09-06 21:58:23 +01:00
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
561c47f777
Merge pull request #1341 from andrewhsu/ven
...
[master] vndr docker/docker to 53e55db
2018-09-05 18:07:02 -07:00
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
612673dd01
Merge pull request #1340 from AkihiroSuda/fix-os-race
...
connhelper: fix cmd.Wait() race
2018-09-05 15:59:37 -07:00
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
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
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
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
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
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
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
1546d71de5
Merge pull request #1098 from dhiltgen/long_help
...
Show long help message when defined
2018-08-30 18:07:10 +02:00
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
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
2018-08-29 07:38:27 -07:00
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
2018-08-29 07:38:19 -07:00
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
ead40ca6b4
Merge pull request #1319 from dhiltgen/fix_progress_master
...
Fix progress reporting for containerd pulls
2018-08-29 12:58:37 +02:00
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
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
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
2018-08-28 16:27:53 -07:00
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
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
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
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
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
08cf36daa6
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
2018-08-22 00:57:27 +01:00
a500c394df
Move "session" support out of experimental for API 1.39 and up
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-22 00:51:19 +02:00
60c75fda67
Remove "experimental" annotations for buildkit
...
BuildKit can now be enabled without the daemon having
experimental features enabled.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-22 00:38:59 +02:00
ca782599fb
Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
...
Use warnings provided by daemon
2018-08-21 13:42:16 -07:00
3c27ce21c9
Use warnings provided by daemon
...
Warnings are now generated by the daemon, and returned as
part of the /info API response.
If warnings are returned by the daemon; use those instead
of generating them locally.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-21 22:29:57 +02:00
7da71329bc
bump docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-21 22:29:43 +02:00
e97d004395
Merge pull request #1233 from selansen/default_addr_pool
...
Global Default Address Pool feature support
2018-08-21 14:55:24 -04:00
587a94c935
Global Default Address Pool feature support
...
This feature brings new attribute/option for swarm init command.
default-addr-pool will take string input which can be in below format.
"CIDR,CIDR,CIDR...:SUBNET-SIZE".
Signed-off-by: selansen <elango.siva@docker.com>
2018-08-21 14:34:00 -04:00
2461cd618d
Merge pull request #1275 from AntaresS/buildkit-support
...
[enhancement] enable buildkit from daemon side
2018-08-20 16:15:32 -07:00
acf43b62b5
vendor dependency
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-20 15:32:25 -07:00
ef09ca8987
enable buildkit as builder from daemon; no env var needs to be set
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-20 11:59:39 -07:00
466e1b0741
Merge pull request #1302 from andrewhsu/venbk
...
vndr buildkit, containerd, console
2018-08-20 11:10:46 -07:00
7a73d112ff
vndr buildkit, containerd, and console
...
vndr buildkit to e8c7acc
vndr containerd to v1.2.0-beta.0
vndr console to 4d8a41f
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-08-20 17:59:40 +00:00
0c444c521f
Merge pull request #1260 from dhiltgen/ce_q3
...
Add CLI support for running dockerd in a container on containerd
2018-08-20 13:39:49 -04:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Benoit Sigoure
Joffrey F
Tibor Vass
Xiaodong Zhang
Akihiro Suda
Xiaoxi He
Lihua Tang
Andrew Hsu
Tibor Vass
Anda Xu
Silvin Lubecki
Arash Deshmeh
Daniel Hiltgen
Marcus Martins
Vincent Demeester
Michael Crosby
selansen