toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,583 Commits 3 Branches 295 Tags
e408ff89372f565bbda44d8fb21df330e970baed
Commit Graph
41583 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 23acff6a45 Merge pull request #1149 from adshmh/add-unit-tests-to-plugin-install 
added unit tests covering content trust for plugin install command
Upstream-commit: b21f9dde61
Component: cli
 2018-06-28 09:28:18 +02:00
GordonTheTurtle 270889f2c3 Bump version to 18.07.0-ce-dev 
Signed-off-by: GordonTheTurtle <engine-team@docker.com>
 2018-06-28 04:04:41 +00:00
GordonTheTurtle b13ea5551c Merge component 'engine' from git@github.com:docker/engine master 2018-06-28 03:56:28 +00:00
Akihiro Suda 2ae84e99a1 Merge pull request #37357 from dmcgowan/update-containerd-1.1.1-rc.2 
Update containerd to v1.1.1-rc.2
Upstream-commit: 37079d66c65d78da66b963315c9102ce67a1d685
Component: engine
 2018-06-28 12:41:05 +09:00
GordonTheTurtle 3f6be54aa7 Merge component 'engine' from git@github.com:docker/engine master 2018-06-28 02:53:18 +00:00
Tibor Vass b30a6b365b Merge pull request #37350 from tonistiigi/platform-support 
Fix platform struct passing
Upstream-commit: 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d
Component: engine
 2018-06-27 19:23:27 -07:00
Arash Deshmeh efa9f9914b added unit tests covering content trust for plugin install command 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: bc9b42ea9b
Component: cli
 2018-06-27 22:16:19 -04:00
Brian Goff d86ac0bd5d Move network conversions out of API router 
This stuff doesn't belong here and is causing imports of libnetwork into
the router, which is not what we want.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c0bc14e8dd5a31f5edc804e9a1347bb3eb44483e
Component: engine
 2018-06-27 17:11:29 -07:00
Tonis Tiigi 1a09169ca0 distribution: remove custom matcher code 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 951faaed664dd51d2aacfdb782534f4c46bd9e23
Component: engine
 2018-06-27 15:33:07 -07:00
Tonis Tiigi d2c785277a system: add back lcow validation function 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0997716651b6e6c2b07e3d514bf8452114a1433
Component: engine
 2018-06-27 15:24:26 -07:00
Tibor Vass 30f83012e0 Merge pull request #37355 from tonistiigi/vendor-containerd 
vendor: update containerd to 08f7ee98
Upstream-commit: 68e25cf5263c4348ac470d76d168c4878dbedf71
Component: engine
 2018-06-27 15:08:22 -07:00
Tonis Tiigi c377af1d4d builder: update platform support to puller 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0b50d6c315a41025de98617bd6cc79c3925838d5
Component: engine
 2018-06-27 14:59:36 -07:00
Tonis Tiigi b67a507422 distribution: fix passing platform struct to puller 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 337ba71fc1124603302e28d94e2f08674e31a756
Component: engine
 2018-06-27 14:59:31 -07:00
Derek McGowan 052d68f05c Update containerd to v1.1.1-rc.2 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 735517928b3c0a9dabdc087b1b2f366d72df3f4e
Component: engine
 2018-06-27 13:49:26 -07:00
John Howard fbe0a9291a LCOW: lazycontext: Use correct lstat, fix archive check 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a5aed699cfaa4d84b1b134033fb468b3a7a874f0
Component: engine
 2018-06-27 13:29:21 -07:00
Tonis Tiigi 86aefcafc8 vendor: update containerd to 08f7ee98 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d66615be94d548c1d102006a477c3abbaff93274
Component: engine
 2018-06-27 11:59:10 -07:00
GordonTheTurtle 09b295216f Merge component 'engine' from git@github.com:docker/engine master 2018-06-27 17:07:34 +00:00
Vincent Demeester 9152b94149 Extract StackConverter from the StackClient 
It makes it easier to get the correct stack from a compose config
struct without requiring the client (and thus talking to k8s API)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f2e6ee6899
Component: cli
 2018-06-27 16:41:00 +02:00
Vincent Demeester 2c564f1c70 Merge pull request #37347 from yui-knk/update_comment 
Update comments about `InitRouter`
Upstream-commit: bab4c0dff73dc38d551ab1a1fdadcbd2757154e7
Component: engine
 2018-06-27 13:46:24 +02:00
Akihiro Suda b383c8f747 Merge pull request #37351 from LotusFenn/unique-names-network-service-test 
Use unique names in integration/network/service_test.go
Upstream-commit: 8f709d894811ec22b621a77fcc0e69476318d7f2
Component: engine
 2018-06-27 20:32:20 +09:00
Vincent Demeester 434a544ab5 Merge pull request #37298 from adshmh/refactor-network-integration-tests-service-use-network-create 
integration/service/network integration tests to use network package
Upstream-commit: 408d317c6008e3d81912a81c3ea96d3f606cf210
Component: engine
 2018-06-27 11:43:04 +02:00
Lotus Fenn bc8dee16e5 add unique names to integration/network/service_test.go 
Signed-off-by: Lotus Fenn <fenn.lotus@gmail.com>
Upstream-commit: f94c97d3200ec11762fc3fb3c2eafd5866ffa976
Component: engine
 2018-06-27 00:56:52 -07:00
Tonis Tiigi 28ca1b95b2 api: fix platform type 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 81f862a1fe6f24fea70b1278a4292eefc4029a03
Component: engine
 2018-06-26 22:59:17 -07:00
Tonis Tiigi 23cd5508d9 builder: buildkit rebase update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 48b93419dcc3dc71584d674f045c30793b890395
Component: engine
 2018-06-26 22:59:17 -07:00
Tonis Tiigi ebe6026bac vendor: update buildkit to cce2080ddb 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 360d2f2ce7cba28fc5427bc346ea37aee7fe78f6
Component: engine
 2018-06-26 22:58:59 -07:00
Vimal Raghubir 5be6ded435 Add: Add missing option 
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
Upstream-commit: a205aecb80
Component: cli
 2018-06-26 22:20:01 -04:00
Yuichiro Kaneko f402d858a8 Update comments about InitRouter 
This is a follow-up of commit 408c7ad (PR: #32453)

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
Upstream-commit: dbd4c290b7029d31fa69c906a8da864589f19e09
Component: engine
 2018-06-27 09:45:06 +09:00
Arash Deshmeh 840124a196 refactored integration/service/network integration tests to use network package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 8b07ec58ea5792f906c006edc5db9f37c7a570de
Component: engine
 2018-06-26 17:18:22 -04:00
Dennis Chen 0c25b296c2 Initial support for OCI multi-platform image 
Add the OCI spec compatible image support in client side.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 7f334d3acfd7bfde900e16e393662587b9ff74a1
Component: engine
 2018-06-26 11:39:29 -07:00
John Howard 758ffaf745 LCOW: Auto-select OS 
Signed-off-by: John Howard <jhoward@microsoft.com>

Addresses https://github.com/moby/moby/pull/35089#issuecomment-367802698.
This change enables the daemon to automatically select an image under LCOW
that can be used if the API doesn't specify an explicit platform.

For example:

FROM supertest2014/nyan
ADD Dockerfile /

And docker build . will download the linux image (not a multi-manifest image)

And similarly docker pull ubuntu will match linux/amd64
Upstream-commit: 35193c0e7dc301e1d2f6ea96e0ce34ffd2d4b88d
Component: engine
 2018-06-26 11:37:43 -07:00
GordonTheTurtle 8a582e89b4 Merge component 'engine' from git@github.com:docker/engine master 2018-06-26 17:08:50 +00:00
GordonTheTurtle fb5a734916 Merge component 'cli' from git@github.com:docker/cli master 2018-06-26 16:41:52 +00:00
Silvin d11d5a93ae Merge pull request #1128 from vdemeester/interpolation-options 
Add options to the compose loader
Upstream-commit: 204ab4ca74
Component: cli
 2018-06-26 15:05:54 +02:00
Silvin 06ae3da352 Merge pull request #1147 from vdemeester/stack-refactoring 
Refactor `stack` command/package
Upstream-commit: ae1618713f
Component: cli
 2018-06-26 15:00:17 +02:00
Vincent Demeester 1821b4879d Refactor stack command/package 
- Handle `bundlefile` directly in the `top-level`
  command. `bundlefile` is still experimental and will be deprecated
  in future version — this should make be easier to remove it.
- Validate the `stack` name in all cases (i.e. whatever the
  orchestrator is used)
- Load the composefile ahead of choosing the orchestrator. This
  removes some slight duplication.
- Makes `RunDeploy` easier to use from outside packages (like
  `docker/app`) with a preloaded configuration.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0f9d24f78d
Component: cli
 2018-06-26 14:07:26 +02:00
Sebastiaan van Stijn f0140f8d7c Merge pull request #37249 from AntaresS/add-test-guidline 
add integration test guidelines
Upstream-commit: 8e610b2b55bfd1bfa9436ab110d311f5e8a74dcb
Component: engine
 2018-06-25 20:44:42 +02:00
Anda Xu 0278df1cff add integration test guidelines 
Signed-off-by: Anda Xu <anda.xu@docker.com>
Upstream-commit: 2d5ea98b2c2223e97627aa0d03e68c3f84e3b662
Component: engine
 2018-06-25 11:40:11 -07:00
Sebastiaan van Stijn c7d47a1863 Merge pull request #37301 from Mischi/fix-define-self 
fix build on OpenBSD by defining Self()
Upstream-commit: cb37987ee11655ed6bbef663d245e55922354c68
Component: engine
 2018-06-25 20:25:38 +02:00
GordonTheTurtle 74bdba8ede Merge component 'engine' from git@github.com:docker/engine master 2018-06-25 17:06:40 +00:00
GordonTheTurtle 1bace24aa7 Merge component 'cli' from git@github.com:docker/cli master 2018-06-25 16:41:38 +00:00
Vincent Demeester e9bc5ab185 Add options to the compose loader 
- Add the possibility to skip interpolation
- Add the possibility to skip schema validation
- Allow customizing the substitution function, to add special cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9fdd14f399
Component: cli
 2018-06-25 17:15:26 +02:00
Sebastiaan van Stijn fad2548681 Merge pull request #1138 from seemethere/env_experimental 
Add env variable option for experimental
Upstream-commit: 61e53fc88a
Component: cli
 2018-06-25 14:47:16 +02:00
Silvin dcf4767db4 Merge pull request #1129 from vdemeester/init-in-composefile 
Add `init` support in 3.7 schema
Upstream-commit: 0f6936d557
Component: cli
 2018-06-25 11:18:20 +02:00
Silvin Lubecki bd5f8ff9d8 Refactor tests 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 38056740d6
Component: cli
 2018-06-25 11:13:32 +02:00
Vincent Demeester ee21c8c224 Add init support in 3.7 schema 
> Run an init inside the container that forwards signals and reaps
  processes

This is supported on `run` and now on Swarm services too, so it's also
possible to have in on a composefile :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cc26da94ed
Component: cli
 2018-06-25 11:13:32 +02:00
Vincent Demeester c882d0eb09 Merge pull request #1126 from vdemeester/extra-extras 
Add an `Extras` field on the compose config types.
Upstream-commit: e529043c51
Component: cli
 2018-06-25 10:58:50 +02:00
Vincent Demeester 27e77fdcd7 Add an Extras field on the compose config types. 
That field is automaticaly populated with any `x-*` field in the yaml.
And marshalling the compose config struct put them back into place.

This make it possible to get those extra fields without re-inventing
the wheel (i.e. reimplementing 80% of the `cli/compose/*` packages.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 80c26f618e
Component: cli
 2018-06-25 10:51:56 +02:00
Vincent Demeester 135541dc2f Merge pull request #37337 from yongtang/37331-follow-up 
Fix a small spacing issue
Upstream-commit: fda9397826dcb51b4e2fdc4bc1f8ce61fba7d884
Component: engine
 2018-06-25 09:24:23 +02:00
Eli Uriegas 138db9c689 Add env variable option for experimental 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: e3bb62ed51
Component: cli
 2018-06-24 21:15:02 +00:00
Yong Tang 6cedb2b4cc Fix a small spacing issue 
As a follow up to https://github.com/moby/moby/pull/37331#pullrequestreview-131411625

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0ed55cd22071a9530feb2ea711cffdfa94e559d8
Component: engine
 2018-06-24 17:27:50 +00:00