toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,131 Commits 3 Branches 295 Tags
ca3c2320e6514d81ba2fd29381dfeb9f0e1e262c
Commit Graph
37131 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass ca3c2320e6 Merge component 'cli' from git@github.com:docker/cli master 2017-06-28 01:54:52 +00:00
Tibor Vass 22fa507f87 Merge component 'engine' from git@github.com:moby/moby master 2017-06-28 01:51:55 +00:00
Sebastiaan van Stijn 8266f5c84f Merge pull request #33838 from lixiaobing1/masterRange 
optimize for loop with rootfs.DiffIDs
Upstream-commit: 74a5b14c80022392c17100e1cde6727842eceb6f
Component: engine
 2017-06-27 14:34:10 -07:00
Brian Goff 59255c95cd Merge pull request #33832 from glasser/glasser/msg-source 
Fix stderr logging for journald and syslog
Upstream-commit: 7843bfde36d9ded6fada32f469fe1790316137ae
Component: engine
 2017-06-27 13:30:41 -04:00
Victor Vieux 50b9ac741e Merge pull request #33690 from raja-sami-10p/pkg/authorization 
Increase test Coverage of pkg/authorization
Upstream-commit: 48e625ccca176787d56a6e87a0e2cc779ce5b6d3
Component: engine
 2017-06-27 10:09:13 -07:00
Vincent Demeester e3e93a641f Merge pull request #33696 from thaJeztah/fix-git-clone 
Fix handling of remote "git@" notation
Upstream-commit: 151c5ea798c476128708a91fda8644a6889c2091
Component: engine
 2017-06-27 16:56:11 +02:00
lixiaobing10051267 41493b0fad optimize for loop with rootfs.DiffIDs 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 80b2c326de29552c6ee4072fca75ae00eb3be41a
Component: engine
 2017-06-27 20:31:27 +08:00
Vincent Demeester 7ef86a57f5 Merge pull request #33835 from Microsoft/jjh/changedir 
LCOW: Change directory from lcow to "Linux Containers"
Upstream-commit: 359ed993525eecb5009c7be1a48a9d646a9e235f
Component: engine
 2017-06-27 09:33:38 +02:00
John Stephens e2c85453e0 Merge pull request #33815 from jstarks/lcow_command_args 
LCOW: pass command arguments without extra quoting
Upstream-commit: bcc8b2bc474ef2536bd4bac93a7b94935efaf57a
Component: engine
 2017-06-26 21:46:29 -07:00
John Howard 02efb01414 LCOW: Change to c:\Program Files\Linux Containers 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2c43cbe0d5132618c74de4631c89c541bbafb8c2
Component: engine
 2017-06-26 21:26:18 -07:00
John Howard 1c03f9a249 Vendor github.com/jhowardmsft/opengcs v0.0.7 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3f14e25a7f67e0236dfdcde792ac571ca7874c47
Component: engine
 2017-06-26 21:24:39 -07:00
Sebastiaan van Stijn 59836240bc Merge pull request #230 from mstanleyjones/remove-userns-details 
Remove specific config info about userns-remap
Upstream-commit: 2eac0bb7b7
Component: cli
 2017-06-26 21:11:53 -07:00
Sebastiaan van Stijn 146ac6efc7 Merge pull request #225 from mstanleyjones/ps-markdown-formatting 
Reformat filtering options in ps ref
Upstream-commit: 8fc3179111
Component: cli
 2017-06-26 21:05:42 -07:00
Sebastiaan van Stijn f453764eee Merge pull request #207 from cyli/warn-swarm-ca-command 
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
Upstream-commit: cfff0e2259
Component: cli
 2017-06-26 20:56:54 -07:00
Tibor Vass 0fcd0709a5 Merge pull request #219 from vieux/scale 
hide `--detach` for docker < 17.05
Upstream-commit: c3e5445659
Component: cli
 2017-06-26 20:47:39 -07:00
Victor Vieux 5323af3564 hide --detach for docker < 17.05 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: db60f25561
Component: cli
 2017-06-26 18:55:30 -07:00
Sebastiaan van Stijn 442b559ba0 Merge pull request #31497 from dnephin/engine-local-image-data 
Add a LastTagTime for images
Upstream-commit: 8f3c526e7851e047f5dde31bd2ce69f960e1d115
Component: engine
 2017-06-26 18:51:09 -07:00
Victor Vieux bc7c33134c Merge pull request #231 from tonistiigi/client-session-fssession 
Incrementally sending build context
Upstream-commit: 0133e13353
Component: cli
 2017-06-26 17:15:34 -07:00
Sebastiaan van Stijn 99068fccc9 Merge pull request #237 from aaronlehmann/progress-before-assignment 
progress: Show progress of replicated tasks before they are assigned
Upstream-commit: 2f58992f85
Component: cli
 2017-06-26 17:14:07 -07:00
Tonis Tiigi f1b5e42df0 Use long running session in builder 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Add incremental context send support

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b95638a5ac
Component: cli
 2017-06-26 16:30:01 -07:00
Aaron Lehmann 525974b970 Merge pull request #33781 from mlaventure/fix-healhcheck-goroutine-leak 
Prevent a goroutine leak when healthcheck gets stopped
Upstream-commit: da28210a157a3bf5662f1a049bb10f9b69d2a5a2
Component: engine
 2017-06-26 15:34:43 -07:00
David Glasser 29123f2ea7 Fix stderr logging for journald and syslog 
logger.PutMessage, added in #28762 (v17.04.0-ce), clears msg.Source. So journald
and syslog were treating stderr messages as if they were stdout.

Signed-off-by: David Glasser <glasser@davidglasser.net>
Upstream-commit: 917050c5728f2fb9958ccb3ab66a23766f741adc
Component: engine
 2017-06-26 14:37:43 -07:00
Sebastiaan van Stijn daace4e1a1 Merge pull request #241 from mstanleyjones/master 
Fix false Liquid errors
Upstream-commit: 3648a8b9d0
Component: cli
 2017-06-26 13:19:04 -07:00
Misty Stanley-Jones 6c88b7bdd9 Fix false Liquid errors 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 11c1729e00
Component: cli
 2017-06-26 12:50:34 -07:00
Daniel Nephin f5f8240661 Set a LastUpdated time in image metadata when an image tag is updated. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 016eea004ba0109d7cd965eab242ed17e4f0f36c
Component: engine
 2017-06-26 12:16:26 -07:00
Sebastiaan van Stijn a8f8b4ccd8 Move IsGitTransport() to gitutils 
This function was only used inside gitutils,
and is written specifically for the requirements
there.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d3d1aabcc68f65d40acbf1b3adc02d13997bb8e2
Component: engine
 2017-06-26 10:07:04 -07:00
Sebastiaan van Stijn 8170be09ea Fix handling of remote "git@" notation 
`docker build` accepts remote repositories
using either the `git://` notation, or `git@`.

Docker attempted to parse both as an URL, however,
`git@` is not an URL, but an argument to `git clone`.

Go 1.7 silently ignored this, and managed to
extract the needed information from these
remotes, however, Go 1.8 does a more strict
validation, and invalidated these.

This patch adds a different path for `git@` remotes,
to prevent them from being handled as URL (and
invalidated).

A test is also added, because there were no
tests for handling of `git@` remotes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 913eb99fdcd26a4106250bd40dfe8b9c18564b23
Component: engine
 2017-06-26 10:02:12 -07:00
Brian Goff 2396f04d09 Merge pull request #33814 from vdemeester/update-go-connections 
Update go-connections dependency
Upstream-commit: 33fd3817b0f5ca4b87f0a75c2bd583b4425d392b
Component: engine
 2017-06-26 10:24:04 -04:00
John Starks a08baae726 LCOW: pass command arguments without extra quoting 
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 19645521a92869be7210fb663ed5e0e82e329ca5
Component: engine
 2017-06-24 10:23:17 -07:00
Vincent Demeester aaa2288536 Merge pull request #33798 from vdemeester/move-some-api-code-away 
Move some `api` package functions away
Upstream-commit: d311a3a681f918906249a1678eab0136ac663f6e
Component: engine
 2017-06-24 14:30:25 +02:00
Vincent Demeester 3172848991 Update go-connections dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 497e6e0caaf805f8693c35cb45edbc8f734f09f2
Component: engine
 2017-06-24 12:40:49 +02:00
Sebastiaan van Stijn d0a0bd4e19 Merge pull request #235 from vdemeester/234-fix-warn 
Add a line break after warning 👼
Upstream-commit: 298d486d8b
Component: cli
 2017-06-24 02:17:26 -07:00
Sebastiaan van Stijn d532fc19ff Merge pull request #33812 from thaJeztah/cleanup-gitignore 
Cleanup gitignore
Upstream-commit: 5e2004c1b9e1cab4b2ac3ba7c8edfd959a67c836
Component: engine
 2017-06-24 01:34:40 -07:00
Sebastiaan van Stijn 7efc650625 Merge pull request #33674 from raja-sami-10p/pkg/templates 
Increase test Coverage of pkg/templates
Upstream-commit: 4964b092384a0e1c42b2db728aeeaf129a50f54f
Component: engine
 2017-06-24 01:04:24 -07:00
Sebastiaan van Stijn ee1b2dfe8c Merge pull request #33467 from bschwind/copy-documentation 
Add note to CopyToContainer documentation
Upstream-commit: 5564fad4068619e7d0c5fd7defe7dd5e3f0edd8c
Component: engine
 2017-06-24 00:19:51 -07:00
Sebastiaan van Stijn ea9175efe5 Cleanup gitignore 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a7b24296c8ad7928ba56a4c2ecd675a34934177d
Component: engine
 2017-06-23 23:04:39 -07:00
Sebastiaan van Stijn c842c1cbcc Merge pull request #33801 from albers/completion-dev-environment 
Add bash completion to the development container
Upstream-commit: 94e9cb13f436509e0c64a17df16b4e9cad536704
Component: engine
 2017-06-23 22:52:14 -07:00
Sebastiaan van Stijn c080f953a4 Merge pull request #33719 from dnephin/warn-on-empty-continuation-carry 
[Builder] Warn on empty continuation lines
Upstream-commit: 8d1ae76dcbbb73d8e20c6a14a7d3fe2410b95f55
Component: engine
 2017-06-23 22:52:02 -07:00
Tibor Vass 8e27989c88 Merge pull request #33707 from Syntaxide/s3fix 
Fix authorization header handling in downloader script.
Upstream-commit: d75eb735eee26521b76c732f8b07cfaf6c460d12
Component: engine
 2017-06-23 20:27:54 -07:00
Sebastiaan van Stijn 8065c10b0c Merge pull request #33698 from cpuguy83/dm_deferred_delete_default 
Enable dm deferred_* with version check
Upstream-commit: 5b54e78947a5ab8b4c9e60179b205a82227944e4
Component: engine
 2017-06-23 19:30:05 -07:00
Aaron Lehmann 3b769b27be progress: Show progress of replicated tasks before they are assigned 
This was only showing tasks that belong to nodes that are currently up,
so that tasks on down nodes don't appear to be stuck. But this
unintentionally excludes tasks that haven't been assigned yet, so if a
task is stuck before assignment, for example because no nodes meet its
constraints, a progress bar won't even be shown. The check should only
apply to tasks that have a node assignment.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d3d09f67b1
Component: cli
 2017-06-23 17:34:59 -07:00
Andrew Hsu 4302a48fed Merge component 'engine' from git@github.com:moby/moby master 2017-06-24 00:04:09 +00:00
Tonis Tiigi ec6218872a fix build issue with updated moby 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ae8d049f9e
Component: cli
 2017-06-23 16:12:20 -07:00
Aaron Lehmann 5b78ab86a3 Merge pull request #31273 from fabiokung/consistent-ro-view 
No container locks on `docker ps`
Upstream-commit: 56ad9bb1b4f7463cf1d6eab8b6f924f46ff2c2fe
Component: engine
 2017-06-23 15:28:55 -07:00
Aaron Lehmann 7a0490e85b Merge pull request #33804 from clnperez/fix-cli-test-autogen 
Fix autogen vars
Upstream-commit: 6e96eec565664a261fd641a6807c3c5e17ffefff
Component: engine
 2017-06-23 15:28:29 -07:00
Andrew Hsu 22a8e5a387 Merge component 'cli' from git@github.com:docker/cli master 2017-06-23 22:23:52 +00:00
Andrew Hsu c2312e39f5 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-23 22:22:32 +00:00
Andrew Hsu d317d39474 Merge pull request #28 from StefanScherer/link-packaging-repo 
Add link to docker-ce-packaging repo
 2017-06-23 14:01:53 -07:00
John Howard 553c4b8a9b Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate 
LCOW: Updates necessary due to platform schema change
Upstream-commit: 25a65a185b6b512117803ab25c716ca8f831ccdf
Component: engine
 2017-06-23 13:08:13 -07:00
Christy Perez 34f4d1d4f0 Fix autogen vars 
commit ea2e4d73c4c753cdc99966e4dfe35143e79564ce removed the autogen
script, but if you happen to clone the dir fresh from git, you can't
build the integration test binaries.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 091e07c87d7dc9130e4f9b0f68342bb07c79ba2f
Component: engine
 2017-06-23 14:40:09 -05:00