starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
40,924 Commits 15 Branches 323 Tags
01a80b2713d6aa2786dd559362396f6fe5030e1b
Commit Graph
40924 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 01a80b2713 Merge component 'cli' from git@github.com:docker/cli master 2018-05-17 16:41:20 +00:00
Sebastiaan van Stijn d1519025fc Merge pull request #1061 from eiais/fishupdate 
Update Events, Exec, Export, History, Images, Import, Inspect, Load, and Login subcommand fish completions
Upstream-commit: 6bab4a2a94
Component: cli
 2018-05-17 14:50:29 +02:00
Sebastiaan van Stijn b38bc2a3c0 Merge pull request #1040 from cyli/deprecated-engine-labels 
Document reserved namespaces deprecation
Upstream-commit: 96dba79d99
Component: cli
 2018-05-16 23:16:28 +02:00
Ying Li 7fa75adc44 Document that reserved namespaces org.docker.*, io.docker.*, and 
org.dockerproject.* in engine labels are now deprecated.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 7470d460f6
Component: cli
 2018-05-16 14:06:37 -07:00
Sebastiaan van Stijn cbe1e262f7 Merge pull request #974 from simonferquel/compose-kube-env-expansion 
[K8s] Do env-variable expansion on the uninterpreted Config files
Upstream-commit: bac0d8f353
Component: cli
 2018-05-16 20:18:41 +02:00
GordonTheTurtle e191ac7ace Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-05-15 17:07:36 +00:00
GordonTheTurtle 6efa476216 Merge component 'engine' from git@github.com:moby/moby master 2018-05-15 17:07:29 +00:00
GordonTheTurtle 233d1d1cd2 Merge component 'cli' from git@github.com:docker/cli master 2018-05-15 16:41:42 +00:00
Vincent Demeester d8a9cf51bb Merge pull request #37070 from vdemeester/fix-master 
Fix logging test type
Upstream-commit: c0d39a1819f4a51fd98ce0f203e0894a540d5a0c
Component: engine
 2018-05-15 17:52:35 +02:00
Vincent Demeester d82d36fd4a Merge pull request #1031 from mat007/kubernetes-orchestrator-all 
Better stack list experience with Kubernetes and Swarm
Upstream-commit: 5a5b880251
Component: cli
 2018-05-15 17:26:41 +02:00
Mathieu Champlon 7a57bbc2b9 Support multiple namespaces for docker stack ls 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 84241cc393
Component: cli
 2018-05-15 16:52:21 +02:00
Mathieu Champlon 46fae6da7e Support 'all' in orchestrator flag for docker stack ls 
All other docker stack commands report an error when passed this value.

Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 4d947de292
Component: cli
 2018-05-15 15:38:41 +02:00
Vincent Demeester c4764c184a Fix logging test type 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 25494e4c74f31551ef06e6e2df4e1119cd83250e
Component: engine
 2018-05-15 15:04:46 +02:00
Sebastiaan van Stijn 6c90b56fe9 Merge pull request #37051 from wagoodman/patch-1 
image spec v1 formatting fix
Upstream-commit: 04864cb3cb526ddeee70dc6e17a6c7802ef91a0b
Component: engine
 2018-05-15 14:00:53 +02:00
Sebastiaan van Stijn 131639fdf7 Merge pull request #37028 from cpuguy83/log_plugin_broken_pipe 
Fix logging plugin crash unrecoverable
Upstream-commit: 6821ffd1a11f188d6b1c3e8da01885768e027586
Component: engine
 2018-05-15 13:57:01 +02:00
Sebastiaan van Stijn 9ebdda8c43 Merge pull request #37033 from cpuguy83/some_container_network_cleanups 
Some container/network cleanups
Upstream-commit: 6f68db8c7a94489b5e66bb828f748d0baa2e5c22
Component: engine
 2018-05-15 13:23:41 +02:00
Sebastiaan van Stijn 14395e1de7 Merge pull request #37062 from cpuguy83/fix_logs_daemon_race 
Fix race conditions in logs API
Upstream-commit: 07dc3aa685ffd500ada1c41f8a9b7eaf74cf09eb
Component: engine
 2018-05-15 11:59:40 +02:00
Vincent Demeester f2fea2ebf4 Merge pull request #37063 from cpuguy83/fix_log_rotation_issue 
Fix some issues in logfile reader and rotation
Upstream-commit: 26da99e326bf7cbfad820395f5379bba7a66c4a5
Component: engine
 2018-05-15 11:46:29 +02:00
Vincent Demeester e35dd65158 Merge pull request #37044 from yongtang/03112018-TestDockerNetworkConnectAlias-name 
Avoid unique name usage in TestDockerNetworkConnectAlias
Upstream-commit: 829dcefa9d090f5101947ee14074d1f37e44468b
Component: engine
 2018-05-15 11:46:11 +02:00
Vincent Demeester 4347082deb Merge pull request #37060 from cpuguy83/fix_swagger_gen 
Fix swagger volume type generation
Upstream-commit: bcd86fc2acd3ef22a7fc6c662c7ae8a67b0bb4f4
Component: engine
 2018-05-15 11:46:02 +02:00
Mathieu Champlon c4cff872f5 Fix typo in golden file name 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 0d7bb8adaa
Component: cli
 2018-05-15 10:09:47 +02:00
Eli Uriegas fa0e6a4fbc Merge pull request #105 from thaJeztah/remove-experimental 
Remove "experimental" env-vars
Upstream-commit: b2dd1df6d30da0b57a8838120b82c6c129414c85
Component: packaging
 2018-05-14 15:44:12 -07:00
Yong Tang d1d5dd5da5 Merge pull request #37030 from adshmh/refactor-service-create-integration-tests-use-swarm-create-service 
Refactor service create integration tests to use swarm CreateService
Upstream-commit: 6de3be1366cda7b24f02dfae7f9abd036b9c7094
Component: engine
 2018-05-14 14:07:22 -07:00
Brian Goff 9488201604 Fix logging plugin crash unrecoverable 
In cases where a logging plugin has crashed when the daemon tries to
copy the container stdio to the logging plugin it returns a broken pipe
error and any log entries that occurr while the plugin is down are lost.

Fix this by opening read+write in the daemon so logs are not lost while
the plugin is down.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e7479e3ab8128f9e84cc640f0bed4e77b268a6e9
Component: engine
 2018-05-14 16:51:56 -04:00
Brian Goff b600301f4e Fix some issues in logfile reader and rotation 
- Check errors.Cause(err) when comparing errors
- Fix bug where oldest log file is not actually removed. This in
particular causes issues when compression is enabled. On rotate it just
overwrites the data in the log file corrupting it.
- Use O_TRUNC to open new gzip files to ensure we don't corrupt log
files as happens without the above fix.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e87e9e6ad6ba501cc42a2ef47ac18c88a68f258f
Component: engine
 2018-05-14 15:52:18 -04:00
Brian Goff 5e354ed533 Fix race conditions in logs API 
Closing the log driver was in a defer meanwhile logs are
collected asyncronously, so the log driver was being closed before reads
were actually finished.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2c252a48c252749d41079cf8c450d00a5c18296e
Component: engine
 2018-05-14 15:48:32 -04:00
Brian Goff 1cb0dc30a7 Fix swagger volume type generation 
This was broken by bf6a790f00ab96bb8857e3c73502909ee5e36217

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b16b125bb4326e2eec9948fd54ca8c5d83eba36a
Component: engine
 2018-05-14 13:46:20 -04:00
GordonTheTurtle f7c75f37ec Merge component 'engine' from git@github.com:moby/moby master 2018-05-14 17:06:38 +00:00
Yong Tang 74db940ed7 Avoid unique name usage in TestDockerNetworkConnectAlias 
In TestDockerNetworkConnectAlias the network and container
names used are unique which are not preferred. This
fix address the issue by appending t.Name() so that
names are randomized.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e7b5f4500dc77ec55e5ef202065fbc92218ce394
Component: engine
 2018-05-14 16:59:13 +00:00
GordonTheTurtle 784c17c2c1 Merge component 'cli' from git@github.com:docker/cli master 2018-05-14 16:41:42 +00:00
Vincent Demeester de8a0bba09 Merge pull request #37034 from cpuguy83/moar_metrics 
Add metrics for log failures/partials
Upstream-commit: ab0dccf80174fa5eef4583a0235b0bf57bdff8df
Component: engine
 2018-05-14 18:05:30 +02:00
Vincent Demeester 96a20527d5 Merge pull request #1048 from thaJeztah/bump-golang-1.10.2 
Bump Golang to 1.10.2
Upstream-commit: 5aa9d6a35f
Component: cli
 2018-05-14 16:20:46 +02:00
Sebastiaan van Stijn c0eb53edfc Bump Golang to 1.10.2 
Go 1.10 release notes: https://golang.org/doc/go1.10

Go 1.10: https://github.com/golang/go/issues?q=milestone%3AGo1.10
Go 1.10.1: https://github.com/golang/go/issues?q=milestone%3AGo1.10.1
Go 1.10.2: https://github.com/golang/go/issues?q=milestone%3AGo1.10.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ee7aa76cff
Component: cli
 2018-05-14 16:04:13 +02:00
Vincent Demeester 70cd643c8a Merge pull request #37040 from thaJeztah/error_on_unsupported_options 
overlay: do not ignore invalid storage-driver options
Upstream-commit: a79d04ae55196f73d67eeb8a40cfbeb67fed95e9
Component: engine
 2018-05-14 15:37:33 +02:00
Vincent Demeester 09aea6c1ab Merge pull request #1055 from mat007/fix-invalid-orchestrator-silently-ignored 
Make an error for an invalid orchestrator
Upstream-commit: 161bc1ed3c
Component: cli
 2018-05-14 15:34:01 +02:00
Sebastiaan van Stijn 7fb4806d90 Merge pull request #36991 from kolyshkin/slice-in-place 
daemon.setMounts(): copy slice in place
Upstream-commit: 31aca4bef4d976ae4e7fb559da52745a3a295100
Component: engine
 2018-05-14 13:49:47 +02:00
Sebastiaan van Stijn be4eb540c9 Merge pull request #1045 from ieugen/ieugen/patch-1 
Added description about pids count.
Upstream-commit: fdf94de537
Component: cli
 2018-05-14 13:32:47 +02:00
Sebastiaan van Stijn e72e7fdac6 Merge pull request #37045 from abhi/inspect 
Fixing network inspect for swarm
Upstream-commit: 8baea3a1bb9a10e4148e320d8933b0a73b7e0b07
Component: engine
 2018-05-14 12:51:12 +02:00
Vincent Demeester 40ccb62e61 Merge pull request #1052 from thaJeztah/fix-rollback-config 
Fix service rollback options being cross-wired
Upstream-commit: 74d86d4b2e
Component: cli
 2018-05-14 11:01:56 +02:00
Vincent Demeester fda16ddde1 Merge pull request #1037 from essamhassan/1036_fix_mounts_typo_in_srv_inspect_pretty 
use : instead of = in mounts service pretty inspect
Upstream-commit: d4ffd9bc71
Component: cli
 2018-05-14 10:55:41 +02:00
Vincent Demeester 0e7e154e05 Merge pull request #37052 from thaJeztah/fix-missing-name-in-message 
Fix missing plugin name in message
Upstream-commit: 8c66c01cd4d2b222d915b9a7123ab8562359283c
Component: engine
 2018-05-14 10:39:39 +02:00
Sebastiaan van Stijn 49316401a9 Fix missing plugin name in message 
This message was missing the name of the plugin, resulting in

    plugin_test.go:92: timeout hit after 30s: plugin %!q(MISSING) exists

On failing tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b526964584d213074de7c5573a3373a58699c181
Component: engine
 2018-05-13 22:26:36 +02:00
Alex Goodman 5ecbe96813 image spec formatting fix 
Embedded new lines aren't interpreted correctly in markdown renderers (they are treated as preformatted text instead). I removed the embedded newlines in the docker image spec.

Signed-off-by: Alex Goodman <wagoodman@gmail.com>
Upstream-commit: 4fb59c20a4fb54f944fe170d0ff1d00eb4a24d6f
Component: engine
 2018-05-13 13:30:53 -04:00
GordonTheTurtle b4b92d031a Merge component 'engine' from git@github.com:moby/moby master 2018-05-13 17:06:28 +00:00
Abhinandan Prativadi 4ca879c241 Fixing network inspect for swarm 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Upstream-commit: a059d6f4f5eb5fdb319b6f715a9bb50eb5d6173d
Component: engine
 2018-05-13 07:31:14 -07:00
Sebastiaan van Stijn 122abc3569 Merge pull request #37049 from yongtang/05122018-version-history 
Fix incorrect link in version-history.md
Upstream-commit: 996eb78fb895ba1cf7ea5773ee36a8651498eb26
Component: engine
 2018-05-13 16:30:58 +02:00
Yong Tang 371327f900 Fix incorrect link in version-history.md 
In version-history.md, the link for `Docker Engine API v1.37`
was pointed to `v1.36`.

This fix fixes the incorrect link.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6d66743ae3da148adbd29fb7e0c0433e93fec12b
Component: engine
 2018-05-13 13:22:39 +00:00
Sebastiaan van Stijn 8082d1152a Merge pull request #37047 from yongtang/05122018-changelog 
Re-order CHANGELOG.md to pass `make validate` test
Upstream-commit: df7c058198a7f4566d46ab732f5987bd33e90a93
Component: engine
 2018-05-13 14:11:56 +02:00
Yong Tang 2d3321ec44 Re-order CHANGELOG.md to pass make validate test 
This fix re-orders the CHANGELOG so that `make validate` test
could pass. The validation requires that the date in the changelog
is always ordered.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 333693c37c8a2c14458d2a088829b9a2a3570eed
Component: engine
 2018-05-13 00:27:51 +00:00
GordonTheTurtle d87eeada6c Merge component 'engine' from git@github.com:moby/moby master 2018-05-12 17:06:49 +00:00