d266af160b
Merge component 'cli' from git@github.com:docker/cli master
2017-07-19 23:39:56 +00:00
7145299da3
Merge pull request #356 from dnephin/fix-codeowners
...
Fix .github/CODEOWNERS patterns
Upstream-commit: 7f684c7512
2017-07-18 17:08:37 -07:00
e4c6e38322
Fix CODEOWNERS patterns.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cea8b4f4f3
2017-07-18 18:25:55 -04:00
7419227176
Merge pull request #351 from dnephin/misc-cleanup
...
Misc cleanup of dockerfiles and circleci
Upstream-commit: 257e113542
2017-07-18 10:44:51 -07:00
7c2dc55ca3
Remove unnecessary prune function aliases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ff350a04cb
2017-07-18 12:25:45 -04:00
29e4b6071d
Cleanup dockerfiles and circle
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f91d9e6c4
2017-07-18 12:22:28 -04:00
c912542d4f
Merge pull request #350 from thaJeztah/unexport-commands
...
Unexport subcommands
Upstream-commit: a14762c6d2
2017-07-18 17:17:01 +02:00
fa129caef8
Merge pull request #341 from thaJeztah/small-prune-refactor
...
Small refactor in system prune
Upstream-commit: 3209cb8da6
2017-07-18 10:45:21 -04:00
ea84db7e56
Unexport subcommands
...
These commands were only used as subcommands, so did
not have to be exported.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9c7b0d74cd
2017-07-18 15:26:45 +02:00
7e5b932e43
Small refactor in system prune
...
Adapt "image prune" and "build cache prune" to have
the same signature as the other prune commands, so
that they can all be added to the "pruneFuncs" array.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 73163ee78b
2017-07-18 15:13:11 +02:00
6250958cd7
Merge pull request #315 from ripcurld0/nat_sort
...
Sort swarm stacks and nodes using natural sorting
Upstream-commit: 79e4d635ca
2017-07-18 15:01:11 +02:00
6db8c53375
Merge pull request #345 from vdemeester/remove-prune-package
...
Remove useless prune package 👼
Upstream-commit: 19efbc85f4
2017-07-18 14:46:53 +02:00
b7e7973a5f
Merge pull request #266 from jphuynh/shellcheck
...
Add shellcheck for bash completion
Upstream-commit: b75596e1e4
2017-07-18 09:59:07 +02:00
8dbc530b62
Remove useless prune package 👼
...
The `cli/command/prune` just does some aliasing of `Prune*` methods,
doesn't have any use.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3f4d91508e
2017-07-18 09:49:02 +02:00
cc2a1a7847
Merge pull request #340 from thaJeztah/fix-dont-prune-build-cache
...
Fix: skip build-cache prune on unsupported versions
Upstream-commit: 277f4b997c
2017-07-18 09:41:37 +02:00
2dc557d71e
Fix: skip build-cache prune on unsupported versions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6c3a448ecb
2017-07-17 11:55:35 +02:00
72d8e914bc
Merge pull request #331 from yuexiao-wang/docker-search-filters
...
Fix filters displaying for docker search
Upstream-commit: 03a46a66bd
2017-07-14 23:30:43 -07:00
c6415e10ce
Merge pull request #314 from allencloud/add-filter-scope-for-events
...
docs: add filter scope for command events and more cluster events
Upstream-commit: 47370b4863
2017-07-14 23:28:55 -07:00
759b91249c
Merge pull request #338 from thaJeztah/carry-moby-32483
...
Service privileges: CLI reference docs & completion
Upstream-commit: 9c9fe9bf1f
2017-07-14 23:26:52 -07:00
42cbae8c65
Service privileges: CLI reference docs & completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5cc7ac2990
2017-07-14 22:30:47 -07:00
c456febc9c
docs: add filter scope for command events and more cluster events
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 8639c9baf8
2017-07-15 09:17:35 +08:00
6d6adf9904
Merge pull request #333 from dnephin/docs-arg-in-from-take-2
...
Improve docs about ARG in FROM
Upstream-commit: fe24806ee5
2017-07-14 18:04:53 -07:00
bab96155c7
Merge component 'engine' from git@github.com:moby/moby master
2017-07-14 21:15:01 +00:00
d85711734b
More about ARG and build stages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ad5d035988
2017-07-14 16:59:21 -04:00
0b42de4e27
Clarify docs about ARG in FROM
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2880030814
2017-07-14 16:55:42 -04:00
1a59a831b3
Merge component 'cli' from git@github.com:docker/cli master
2017-07-14 20:04:39 +00:00
c2eba39c13
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-07-14 20:03:09 +00:00
a50b8e5956
Merge pull request #335 from coolljt0725/add_env
...
Add DOCKER_BUILD_ARGS to support build with proxy
Upstream-commit: 0c8d401cd8
2017-07-14 11:41:44 -04:00
19bca77267
Merge pull request #34077 from justincormack/mount_remount_opts
...
In the case of remounting with changed data, need to call mount
Upstream-commit: f7ce35f47b1b8e029d7e572ef333cabba1b08e5b
Component: engine
2017-07-14 09:58:30 -04:00
0667ef33f8
Add DOCKER_BUILD_ARGS to support build with proxy
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d8681fadb
2017-07-14 05:20:18 -04:00
5aee375eb4
Fix inconsistencies
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: d7748e1b01
2017-07-14 09:24:46 +01:00
c8dfc96c37
Merge pull request #324 from cyphar/libdm-debug-flag-docs
...
docs: add documentation for dm.libdm_log_level
Upstream-commit: de4c546b7e
2017-07-14 00:58:38 -07:00
240df15e94
Merge pull request #34076 from yastij/33679-renaming-id-meth
...
renaming id() to state clearly that it's related to the networkAttachment
Upstream-commit: ce0ef9568d945b3d16442906a428b6f80fedc4dd
Component: engine
2017-07-14 00:29:09 -07:00
becbfbd6d3
docs: add documentation for dm.libdm_log_level
...
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: c7710819a5
2017-07-14 16:52:33 +10:00
fd5e2f635f
Merge pull request #34089 from tonistiigi/builder-report-2017-07-10
...
Add builder dev report for 2017-07-10
Upstream-commit: 93494237df7ddcd78738b68d5c48ed08e3755423
Component: engine
2017-07-13 23:25:57 -07:00
0393b35079
Merge pull request #34 from andrewhsu/check-clean
...
check if build dir exists before chown
Upstream-commit: 6829cb8fdb1ffad738d9742329bf83de1b2aad8b
Component: packaging
2017-07-13 21:50:19 -07:00
16b3113441
check if build dir exists before chown
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 46dd23f1fc2863741783f0584dad1a42815e5438
Component: packaging
2017-07-14 04:35:47 +00:00
80e097613a
Merge pull request #34063 from dnephin/fix-builder-no-such-layer
...
Fix multiple `COPY --from` in multistage builds
Upstream-commit: 1daa10301acfe0742dd852dfb8603c48afdaa1ee
Component: engine
2017-07-14 12:19:19 +09:00
d96f150bfb
Fix filters displaying for docker search
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bd64ad25fb
2017-07-14 08:56:20 +08:00
b9deee44fd
Merge pull request #33969 from Microsoft/jjh/lifetime
...
LCOW: Service VM lifetime changes
Upstream-commit: f22cecf9297a467f20bf49bc1c7aef5d2ee3a59c
Component: engine
2017-07-13 15:51:21 -07:00
6da354bd2c
Merge pull request #10 from seemethere/reflective_alpine_images
...
Add reflective alpine images to other components
Upstream-commit: f373edf0ac49203be0b8dd66f75237e18927c553
Component: packaging
2017-07-13 15:29:20 -07:00
480f1b0a2a
ALPINE -> ALPINE_IMG
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ee25bc2379126a75116ce66daffda6c7d3f41d42
Component: packaging
2017-07-13 15:19:22 -07:00
fa401fa1b5
Add reflective alpine images to other components
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 0435cef6a945dc1c57b51cb24b36aaf66be8d8cc
Component: packaging
2017-07-13 15:16:51 -07:00
33db8883ea
Fix code location when mounting to docker-cli-shell-validate
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: ffe8509663
2017-07-13 22:24:08 +01:00
cbcb37cde8
Update dockerfile path for CicleCI build
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 501cf0e6d1
2017-07-13 22:24:08 +01:00
dc6c9cd967
Reword to remove ambiguity with go validate
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 2e7d24cae8
2017-07-13 22:24:08 +01:00
a61c7f009e
Add shellcheck for bash completion
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: b2fc35aefa
2017-07-13 22:24:08 +01:00
9ed5ded98d
LCOW: Service VM lifetime changes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This changes the LCOW driver to support both global SVM lifetime and
per-instance lifetime. It also corrects the scratch implementation.
Upstream-commit: 76b0d4819a50c50edd79890db0b92eb96c8d46e6
Component: engine
2017-07-13 11:09:43 -07:00
a100224db8
Add builder dev report for 2017-07-10
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2689f9cc0b45dfbacf52f8f08a7b5f4abb286427
Component: engine
2017-07-13 09:30:13 -07:00
d4d72fe32c
In the case of remounting with changed data, need to call mount
...
The case where we are trying to do a remount with changed filesystem specific options was missing,
we need to call `mount` as well here to change those options.
See #33844 for where we need this, as we change `tmpfs` options.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 3a1ab5b479ce843648cf676fbaaf2bec9e040dce
Component: engine
2017-07-13 15:48:58 +01:00
