p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
39,666 Commits 2 Branches 295 Tags
c1528c13574fc8f29c2ea8026bc474615a2d9725
Commit Graph

39666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle
c1528c1357 Merge component 'cli' from git@github.com:docker/cli master 2018-01-30 16:41:38 +00:00
Sebastiaan van Stijn
db1ce9af6b Merge pull request #838 from vdemeester/fix-label-file-behavior 
Fix `--label-file` weird behavior
Upstream-commit: 9de1b162fa
Component: cli
 2018-01-29 17:32:21 -08:00
Daniel Nephin
f6b5291c4c Merge pull request #844 from tophj-ibm/bump-to-go-1-9-3 
Bump Go to 1.9.3 (cont.)
Upstream-commit: 7da324a2f6
Component: cli
 2018-01-29 16:17:28 -05:00
Vincent Demeester
aea7a7fc73 Fix --label-file weird behavior 
`--label-file` has the exact same behavior as `--env-file`, meaning any
placeholder (i.e. a simple key, no `=` sign, no value), it will get the
value from the environment variable.

For `--label-file` it should just add an empty label.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2b17f4c8a8
Component: cli
 2018-01-29 11:08:54 -08:00
Christopher Jones
33c438d7c6 Bump Go to 1.9.3 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d89f5fa731
Component: cli
 2018-01-29 13:43:59 -05:00
GordonTheTurtle
691eb859f4 Merge component 'engine' from git@github.com:moby/moby master 2018-01-29 17:04:44 +00:00
Akihiro Suda
13e5898067 Merge pull request #34369 from cyphar/build-buildmode-pie 
*: switch to -buildmode=pie
Upstream-commit: cd3c0057ac28b5601196424597d7fed226948386
Component: engine
 2018-01-29 23:54:03 +09:00
Sebastiaan van Stijn
a94b27c618 Merge pull request #36132 from yongtang/01282018-typo 
Fix a typo in CONTRIBUTING.md
Upstream-commit: 4219df22fc138bc9d180ef81ab2838bb85d96ace
Component: engine
 2018-01-28 12:21:46 -08:00
GordonTheTurtle
a1a0300f4c Merge component 'engine' from git@github.com:moby/moby master 2018-01-28 17:04:35 +00:00
GordonTheTurtle
eac1cd59fb Merge component 'cli' from git@github.com:docker/cli master 2018-01-28 16:41:09 +00:00
Yong Tang
7b9944fc04 Merge pull request #36074 from shutefan/master 
Update API docs to show that /containers/{id}/kill returns HTTP 409
Upstream-commit: 958200970f4c52fd093aa913632d2d2b79ebf969
Component: engine
 2018-01-28 08:32:35 -08:00
Yong Tang
9a7da567a7 Fix a typo in CONTRIBUTING.md 
`seperate` -> `separate`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cce360c7b0136f91fdce6e15ec7fb83eb14153f2
Component: engine
 2018-01-28 16:19:51 +00:00
Yong Tang
b24e274bbe Merge pull request #36099 from thaJeztah/bump-libnetwork3 
bump libnetwork to 5ab4ab830062fe8a30a44b75b0bda6b1f4f166a4
Upstream-commit: 9368e9dac3e7202d2b15a83427010db7b062033a
Component: engine
 2018-01-27 21:47:29 -08:00
Yong Tang
5e3cb1566c Merge pull request #34992 from allencloud/simplify-shutdowntimeout 
simplify codes on calculating shutdown timeout
Upstream-commit: c9f1807abbc60236f5552f8dd25e6d484584f037
Component: engine
 2018-01-27 18:26:54 -08:00
Sebastiaan van Stijn
8f3ae07b6b Merge pull request #717 from albers/completion-images-2 
Improve and fix bash completion for images
Upstream-commit: 4586609f71
Component: cli
 2018-01-27 17:48:49 -08:00
Sebastiaan van Stijn
8d2c67f10d Merge pull request #36095 from yongtang/36083-network-inspect-created-time 
Fix issue where network inspect does not show Created time for networks in swarm scope
Upstream-commit: 924fb0e843930ca444e0f3a6632d7cb67a3da479
Component: engine
 2018-01-26 17:18:30 -08:00
Sebastiaan van Stijn
3d79cf83bd Merge pull request #35911 from ASMfreaK/Russian-Scientsists-addition-to-names-generator 
Add more russian scientists in names-generator.go
Upstream-commit: c41c80026b1469d398edee0167ef33653ff82e93
Component: engine
 2018-01-26 15:48:58 -08:00
Daniel Nephin
37f71b34b7 Merge pull request #804 from thaJeztah/more-annotations 
Annotate "stack" commands to be "swarm" and "kubernetes"
Upstream-commit: a46fa0759d
Component: cli
 2018-01-26 15:12:09 -05:00
Michael Crosby
db2a10168c Merge pull request #36047 from cpuguy83/graphdriver_improvements 
Do not make graphdriver homes private mounts.
Upstream-commit: 2c05aefc99d33edde47b08e38978b6c2f4178648
Component: engine
 2018-01-26 13:54:30 -05:00
Vincent Demeester
5338e07ad9 Merge pull request #829 from thaJeztah/bump-moby 
Bump moby and dependencies
Upstream-commit: 44e93ddd13
Component: cli
 2018-01-26 10:42:14 -08:00
Allen Sun
4e8a0d189e Simplify codes on calculating shutdown timeout 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de68ac8393d32d2c2028dd11c5816430ad0d8d8b
Component: engine
 2018-01-26 09:18:07 -08:00
GordonTheTurtle
62e8f8e9af Merge component 'engine' from git@github.com:moby/moby master 2018-01-26 17:03:45 +00:00
Vincent Demeester
b4eb2e9242 Merge pull request #34372 from cpuguy83/more_error_handling_for_pluginrm 
Ignore exist/not-exist errors on plugin remove
Upstream-commit: 6d4d3c52ae7c3f910bfc7552a2a673a8338e5b9f
Component: engine
 2018-01-25 20:45:17 -08:00
Yong Tang
ffe64d412a Merge pull request #36108 from Microsoft/jjh/opengcsv0.3.6 
Revendor Microsoft/opengcs @ v0.3.6
Upstream-commit: 3e416acf1d9e295b9d75dc222b7897ecfd22d26e
Component: engine
 2018-01-25 16:42:35 -08:00
Sebastiaan van Stijn
c49971b835 Merge pull request #36052 from Microsoft/jjh/no-overlay-off-only-one-disk 
LCOW: Regular mount if only one layer
Upstream-commit: a8d0e36d0329063af9205b4848d1f5c09bd4c3be
Component: engine
 2018-01-25 15:46:16 -08:00
Vincent Demeester
b78f97f4d9 Merge pull request #36116 from yongtang/34655-follow-up 
Update API version history for `Init` with `POST /containers/create`
Upstream-commit: 4b9b8d6278b594c26f396044a964a1dd1b32f0f7
Component: engine
 2018-01-25 15:36:20 -08:00
Brian Goff
96ed38b227 Merge pull request #35979 from emil2k/fix-container-copy-err 
Wrap response errors for container copy methods.
Upstream-commit: 1d1845de5464d7ba8e7b735b0d221b1232851ab2
Component: engine
 2018-01-25 13:48:49 -08:00
Yong Tang
66b09830df Merge pull request #36105 from yongtang/01242018-golint 
Golint fix with ro_layer.go
Upstream-commit: 7db39720b27e2028af88b8e692aa056ec0d273eb
Component: engine
 2018-01-25 13:22:51 -08:00
Yong Tang
2abfa99b63 Update API version history for Init with POST /containers/create 
This is a follow up to
https://github.com/moby/moby/pull/34655#pullrequestreview-91096779

to update API version history for `Init` field.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 376658e41485c43de53391000ad52d1281f9c464
Component: engine
 2018-01-25 19:05:22 +00:00
Yong Tang
39f9f3f6e3 Merge pull request #34655 from nmeyerhans/document-init-api 
Add Init API field documentation to swagger
Upstream-commit: 093a5402a041e9648d03d3e6545fa255e8fe96b2
Component: engine
 2018-01-25 10:16:27 -08:00
Brian Goff
aab82bfc9c Ignore exist/not-exist errors on plugin remove 
During a plugin remove, docker performs an `os.Rename` to move the
plugin data dir to a new location before removing to acheive an atomic
removal.

`os.Rename` can return either a `NotExist` error if the source path
doesn't exist, or an `Exist` error if the target path already exists.
Both these cases can happen when there is an error on the final
`os.Remove` call, which is common on older kernels (`device or resource
busy`).

When calling rename, we can safely ignore these error types and proceed
to try and remove the plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 93027b1ff2475b66b6321b5722009fad4def8187
Component: engine
 2018-01-25 09:23:54 -08:00
GordonTheTurtle
ecf18b66ed Merge component 'engine' from git@github.com:moby/moby master 2018-01-25 17:06:29 +00:00
GordonTheTurtle
680f21a8d2 Merge component 'cli' from git@github.com:docker/cli master 2018-01-25 16:43:34 +00:00
Vincent Demeester
32830b59ac Merge pull request #36100 from thaJeztah/update-authors 
Update authors
Upstream-commit: a2445fee0cec27cb350c3b80169ec33716a1388e
Component: engine
 2018-01-24 20:35:51 -08:00
John Howard
4772ea5aec Revendor Microsoft/opengcs @ v0.3.6 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ace588284dc17fc9c92c30e1697558d0b2cc1262
Component: engine
 2018-01-24 16:09:58 -08:00
Sebastiaan van Stijn
0a23b8e672 Merge pull request #35989 from dani-docker/orca-11380 
verbose info is missing for partial overlay ID
Upstream-commit: 2b2265acbb7b1457cd6657a5e4e5503472b306d1
Component: engine
 2018-01-24 16:01:31 -08:00
Daniel Nephin
0532f832be Merge pull request #827 from thaJeztah/bump-go-1.9.3 
Bump Go to 1.9.3
Upstream-commit: 819df0ebf6
Component: cli
 2018-01-24 17:34:05 -05:00
Sebastiaan van Stijn
077b817634 Bump Go to 1.9.3 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ffc7648322
Component: cli
 2018-01-24 14:25:13 -08:00
Vincent Demeester
e7e06ee745 Merge pull request #34379 from cpuguy83/mount_optimizations 
Optimizations for recursive unmount
Upstream-commit: 59e86068e6b2c23f083bd30b9987fea3fe90ba18
Component: engine
 2018-01-24 14:00:58 -08:00
Yong Tang
1956fc58bd Merge pull request #36096 from cpuguy83/use_rshared_prop_for_daemon_root 
Set daemon root to use shared propagation
Upstream-commit: 3ca99ac2f4a7196097d8f5d037ac10ebbcbb5c3c
Component: engine
 2018-01-24 12:24:33 -08:00
Yong Tang
f813e83349 Merge pull request #36078 from mixja/multiline-max-event-processing 
awslogs - don't add new lines to maximum sized events
Upstream-commit: a636ed5ff473d69e9d0cda352fef0823518f016a
Component: engine
 2018-01-24 12:06:49 -08:00
Yong Tang
61c1474fc0 Merge pull request #35938 from yongtang/35931-filter-before-since 
Fix `before` and `since` filter for `docker ps`
Upstream-commit: 25e56670cf7cd69e60c0d58ed25c33dbb21d3d8e
Component: engine
 2018-01-24 12:06:19 -08:00
Yong Tang
a0a9bd7e22 Merge pull request #36077 from yongtang/35752-verifyNetworking 
Verify NetworkingConfig to make sure EndpointSettings is not nil
Upstream-commit: 914ce4fde798b41144ac931619f39a2c96eab261
Component: engine
 2018-01-24 12:05:58 -08:00
Eli Uriegas
13bb02e502 Merge pull request #398 from seemethere/bump_ver_18_03_dev 
[master] bump version to 18.03.0-ce-dev
 2018-01-24 11:39:43 -08:00
Eli Uriegas
8f89082c26 bump version to 18.03.0-ce-dev 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-01-24 19:37:16 +00:00
Sebastiaan van Stijn
0093346692 Merge pull request #831 from silvin-lubecki/fix-kubernetes-flags 
Fix broken Kubernetes stack flags
Upstream-commit: f9039fe291
Component: cli
 2018-01-24 10:45:45 -08:00
GordonTheTurtle
ef4aa7ebe5 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-01-24 18:36:44 +00:00
GordonTheTurtle
0851fa60de Merge component 'engine' from git@github.com:moby/moby master 2018-01-24 18:36:38 +00:00
Yong Tang
4de8cf5f5e Golint fix with ro_layer.go 
A small golint fix with ro_layer.go.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 19918b88b7b9fe6fc668847f31c94068c78ef2d1
Component: engine
 2018-01-24 18:24:03 +00:00
Noah Meyerhans
a42cb7a60a Add Init API field documentation to swagger 
Signed-off-by: Noah Meyerhans <nmeyerha@amazon.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 467ea71e5e2a0142c1456e3280d69a9538402fec
Component: engine
 2018-01-24 09:46:12 -08:00