toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,584 Commits 3 Branches 295 Tags
v17.07.0-ce
Commit Graph
37584 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 08990efb47 Merge pull request #226 from mstanleyjones/typo-fix-auth 
Fix small typo
Upstream-commit: ae2c3ffb40
Component: cli
 2017-06-22 10:01:24 +02:00
Vincent Demeester ce6099fcd2 Merge pull request #228 from seemethere/wrap_pwd 
Fix mounts for directories with weird chars
Upstream-commit: 53ac8bbed8
Component: cli
 2017-06-22 09:59:41 +02:00
Raja Sami 8aabb3651f Increase the Coverage of pkg/streamformatter 
Signed-off-by: Raja Sami <raja.sami@tenpearls.com>
Upstream-commit: 956c5b61cea9e476847b9d2231ac66d3ec85f018
Component: engine
 2017-06-22 12:29:10 +05:00
Sebastiaan van Stijn ce27333614 Merge pull request #33776 from thaJeztah/remove-deprecated-mkimage 
Remove deprecated contrib/mkimage-xyz scripts
Upstream-commit: 5f0062f0fa97adc480f2e15b20efb89f5cbe3b5b
Component: engine
 2017-06-21 22:41:48 -07:00
John Howard 40224fcf4b LCOW: owner and network endpoints 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e99a633720563d8d8d2669791cee542c0f989291
Component: engine
 2017-06-21 22:35:30 -07:00
Sebastiaan van Stijn 02a0e27cd2 Remove deprecated contrib/mkimage-xyz scripts 
The contrib/mkimage-busybox.sh, contrib/mkimage-debootstrap.sh,
and  contrib/mkimage-rinse.sh were deprecated in commit
51f707cf9dfb2dbe31cfd0cd92b922ca5d98e842, in favor of
their equivalents in contrib/mkimage/

Given that the deprecation warning has been in place
for over three years, it's save to now remove these.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d14fb3ac4e712e5927eaad33213b0910aa56ec13
Component: engine
 2017-06-21 21:56:24 -07:00
Brian Goff 0ae69f3fe0 Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers 
Cleanup more cli leftovers
Upstream-commit: 4bdb6ed9b58d641176a601cfe92d496038c5a557
Component: engine
 2017-06-21 21:23:28 -07:00
Fabio Kung 33086f32cd Grab a lock to read container.RemovalInProgress 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 481a92cb4111ebc1b7d4de5eeff84f570e4ba5dd
Component: engine
 2017-06-21 19:11:23 -07:00
Eli Uriegas 9fb14cdd14 Fix mounts for directories with weird chars 
Fixes:
`make -f docker.Makefile binary`

When directories have characters like `&&` they must be wrapped in
quotes or else the docker run command will fail.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 1119e992f2
Component: cli
 2017-06-21 17:47:40 -07:00
Brian Goff 2182fa2720 Merge pull request #32779 from rremer/auto-update-client 
pull client API version negotiation out of the CLI and into the client
Upstream-commit: 8a672ba1aa5534a633b05fec7954afefd00b49f6
Component: engine
 2017-06-21 17:35:22 -07:00
John Stephens ad62bca460 Merge pull request #33241 from Microsoft/jjh/multi-layerstore 
LCOW: Support most operations excluding remote filesystem
Upstream-commit: 930e6896685f614d8f15ed10207596b1a151cbc8
Component: engine
 2017-06-21 15:45:23 -07:00
Aaron Lehmann 61e4b54502 Vendor swarmkit 79381d0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 79b940feee9cf18893ead7269cfd59ec41bd7297
Component: engine
 2017-06-21 15:32:53 -07:00
Brian Goff f9852d6a7a Don't json marshal then immediately unmarshal 
During container startup we end up spending a fair amount of time
encoding/decoding json.
This cuts out some of that since we already have the decoded object in
memory.

The old flow looked like:

1. Start container request
2. Create file
3. Encode container spec to json
4. Write to file
5. Close file
6. Open file
7. Read file
8. Decode container spec
9. Close file
10. Send to containerd.

The new flow cuts out steps 6-9 completely, and with it a lot of time
spent in reflect and file IO.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8d588d9c5b5cd019e09bcfc4f790eae79405c7b1
Component: engine
 2017-06-21 15:18:01 -07:00
Sebastiaan van Stijn f7df2b4669 Merge pull request #33735 from tonistiigi/force-pull-fix 
builder: fix copy —from conflict with force pull
Upstream-commit: 795a2fdbcb31fdc80ed5bb1fc8bf01e44b1a961d
Component: engine
 2017-06-21 12:07:54 -07:00
Misty Stanley-Jones 08cdfb1fb9 Fix small typo 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ede69a38c2
Component: cli
 2017-06-21 11:06:26 -07:00
Misty Stanley-Jones c6aa6c7ead Reformat filtering options in ps ref 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 0888df3058
Component: cli
 2017-06-21 10:31:03 -07:00
Brian Goff 4dc3e08e78 Merge pull request #33755 from aaronlehmann/imagestore-locking 
image: Improve store locking
Upstream-commit: e64c2d7122158d7d8583ff6967c3e4a833042c25
Component: engine
 2017-06-21 10:01:19 -07:00
Daniel Nephin ebe9d0fb69 Merge pull request #152 from dnephin/improve-volume-parse 
Improve volume spec parsing
Upstream-commit: edfc89f4de
Component: cli
 2017-06-21 11:45:20 -04:00
Vincent Demeester bcbca95cb7 Merge pull request #222 from thaJeztah/carry-moby-33290 
Explain `stack deploy` with multiple Compose files
Upstream-commit: 4b1055aaa6
Component: cli
 2017-06-21 17:36:20 +02:00
Daniel Nephin 3cdf042bf3 Remove yaml docs generator and man pages 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2b45ec7f786bc91d6db42bd33c13e28a06d30aa3
Component: engine
 2017-06-21 11:20:05 -04:00
Daniel Nephin 6dc61813df Remove bindata 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 96e61f3173c21a94f06db2bf1f8a6041da3e4e21
Component: engine
 2017-06-21 11:20:05 -04:00
Daniel Nephin 628a1d1381 remove cli concerns from hack/make 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ea2e4d73c4c753cdc99966e4dfe35143e79564ce
Component: engine
 2017-06-21 11:20:05 -04:00
Daniel Nephin e9c808203d Remove miekg/pkcs11 from vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e5293c253c4803de75c77cc9cee024d95303d6a
Component: engine
 2017-06-21 11:18:44 -04:00
Daniel Nephin 10a4963c2c Remove pkcs11, libltdl-dev, and clang for osx. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b877fc31c51baaf1ec42501ab366dd05a5b6bb21
Component: engine
 2017-06-21 11:18:44 -04:00
Vincent Demeester da0da46764 Merge pull request #33749 from Microsoft/jjh/cross 
Show what cross-build is executing
Upstream-commit: be02125491bf0b4556b3f82377ae7ff9b88f336a
Component: engine
 2017-06-21 17:17:10 +02:00
Daniel Nephin 2b68a9d068 Use compose volume spec parser for container volume flag 
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 732261f774
Component: cli
 2017-06-21 11:16:04 -04:00
Daniel Nephin 49c6d18b80 Some improvements to compose volume spec parsing 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: db6ff357a7
Component: cli
 2017-06-21 11:13:52 -04:00
Vincent Demeester 3738ce72e4 Merge pull request #33748 from cpuguy83/remove_osx_cross 
Remove OSX cross stuff from main Dockerfile
Upstream-commit: 9823457ed5af653689a3eb59f43960138b5528f3
Component: engine
 2017-06-21 14:14:09 +02:00
Boaz Shuster 8903bd3d57 Unmarshal a number as a Number in RawInspectFallback 
Running `docker inspect --format "{{.ID}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3983636
While `docker inspect --format "{{.Id}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3.983636e+06

This happens because "Id" is not a field of types.ImageInspect and thus
tryRawInspectFallback is called and converts the raw response into `interface{}`
using a JSON decoder. However, by default that decoder converts numbers into
`float64` unless `UseNumber` is set.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 9a2f2d769d
Component: cli
 2017-06-21 13:10:14 +03:00
Vincent Demeester 3d78550cb5 Merge pull request #164 from mstanleyjones/clarify-attach 
Clarify ability to attach multiple times
Upstream-commit: 9f00ec085f
Component: cli
 2017-06-21 10:59:34 +02:00
Vincent Demeester a375e303b3 Merge pull request #33757 from tonistiigi/update-docker-py 
dockerfile: update docker-py
Upstream-commit: 29c0238cac6ecdf2bf81513570c4b5fec1bb5094
Component: engine
 2017-06-21 10:23:54 +02:00
Vincent Demeester be0409b2e0 Merge pull request #196 from dnephin/use-circleci-workflow 
Use CircleCI workflows
Upstream-commit: 93562e94a9
Component: cli
 2017-06-21 10:06:31 +02:00
Vincent Demeester 3b2ad4db09 Merge pull request #214 from adshmh/add-unit-tests-to-stack-package 
add unit tests to stack package
Upstream-commit: d5d0ec56c1
Component: cli
 2017-06-21 10:00:08 +02:00
Royce Remer 24b6b491fa pull client API version negotiation out of the CLI and into the client 
Signed-off-by: Royce Remer <royceremer@gmail.com>
Upstream-commit: 5f1d94e569592fc2680f8661e16d0e5b02e82492
Component: engine
 2017-06-20 22:58:16 -07:00
Tonis Tiigi 1aa240e6dc dockerfile: update docker-py 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d183d6fa7d91307eb6ea68582697f3e1e5e5dfcd
Component: engine
 2017-06-20 22:03:35 -07:00
Sebastiaan van Stijn 878246195d Merge pull request #216 from thaJeztah/fix-markdown 
Fix Markdown formatting of experimental "stacks"
Upstream-commit: e07fbfda7e
Component: cli
 2017-06-20 21:31:07 -07:00
Sebastiaan van Stijn 0e797a650f Explain stack deploy with multiple Compose files 
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.

Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 36fa4af30b
Component: cli
 2017-06-20 21:23:21 -07:00
Daniel Nephin edf13621d4 Fix lint errors merged while new lint branch was in PR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b84e21cd05
Component: cli
 2017-06-21 00:11:59 -04:00
John Howard 429224cba5 LCOW: Set correct default shell for platform in builder 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fe7b4d8fcd737b9162540149acc427d51d1ddfb9
Component: engine
 2017-06-20 19:54:33 -07:00
John Howard c06d3d8d0f Show what cross-build is executing 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d82e26ae424b421a047aeb0f3c866e8fe49351d8
Component: engine
 2017-06-20 19:50:14 -07:00
John Howard 5115d455e7 LCOW: Rework after 33454 merged which refactored daemon/builder interface 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3a09b56a10960fb740182d2a12e907f2e80b54c8
Component: engine
 2017-06-20 19:50:13 -07:00
John Howard 2c98e91710 LCOW: Fix schemav1 pull to extract platform 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b21d9ab5954b77222985fcbd326b1ef7ff7f6d64
Component: engine
 2017-06-20 19:50:13 -07:00
John Howard 420a8c950f LCOW: Coherency - ensure windowsfilter driver is not used 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bdabc76a5336322de505f8ec7dd3e0959c5919a8
Component: engine
 2017-06-20 19:50:13 -07:00
John Howard 30ae68b1d5 LCOW: Don't mount for linux containers either 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f8aa70055ef59e73f3c52fc028a0ad3c1634e697
Component: engine
 2017-06-20 19:50:12 -07:00
John Howard 01b491fce5 LCOW: Create layer folders with correct ACL 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ed10ac6ee93cf5c389a735c0c97b08d5d5dff3a9
Component: engine
 2017-06-20 19:50:12 -07:00
John Howard 94ce604e3d LCOW: OCI Spec and Environment for container start 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f1545882264e743fa6d6859ee8687407e28fc35c
Component: engine
 2017-06-20 19:50:11 -07:00
John Howard 3ad2759bd3 Vendor jhowardmsft/opengcs v0.0.3 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 07034a4420c9bd1cb964f18c0128a215ab17d5a8
Component: engine
 2017-06-20 19:49:56 -07:00
John Howard 1a43aff22a Vendor Microsoft/hcsshim @ v0.5.2 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8fe9eb0551aa02eeacf1a27d5cf5adeb0c2bacac
Component: engine
 2017-06-20 19:49:55 -07:00
John Howard 9541d17c29 LCOW: Plumb through platform on Import 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3d5cec70b4432866e4c290e9fc601571ca09da9d
Component: engine
 2017-06-20 19:49:54 -07:00
John Howard 6ced3cca3f LCOW: Push to switch platform 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a97b99e2d801ed1ec4c77387dd7b47631697c25f
Component: engine
 2017-06-20 19:49:54 -07:00