toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,401 Commits 3 Branches 295 Tags
8a582e89b407639018e067123eb17f61dbfd10ee
Commit Graph

41401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GordonTheTurtle
97928f596b Merge component 'engine' from git@github.com:docker/engine master 2018-06-24 17:07:27 +00:00
GordonTheTurtle
66045797ee Merge component 'cli' from git@github.com:docker/cli master 2018-06-24 16:41:54 +00:00
Vincent Demeester
2bd0b7012e Merge pull request #1141 from adshmh/fix-output-leak-from-TestRunCommandWithContentTrustErrors 
fixed output leak from TestRunCommandWithContentTrustErrors
Upstream-commit: 1c20e3f601
Component: cli
 2018-06-24 09:20:56 +02:00
Yong Tang
327777461f Merge pull request #37331 from MartinMuzatko/patch-1 
Just satisfying my OCD - fixed comment spacing
Upstream-commit: 320e4fed2258ba9eea97f2e0b8a4e08d835bb080
Component: engine
 2018-06-23 10:28:25 -07:00
GordonTheTurtle
4549d05aa4 Merge component 'cli' from git@github.com:docker/cli master 2018-06-23 16:42:01 +00:00
Arash Deshmeh
003f07b295 fixed output leak from TestRunCommandWithContentTrustErrors unit tests 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: d469cbdd14
Component: cli
 2018-06-23 10:27:27 -04:00
Silvin
4681fad5b4 Merge pull request #1139 from thaJeztah/add_orchestrator_warning 
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
Upstream-commit: cc9495ac89
Component: cli
 2018-06-23 14:33:28 +02:00
Silvin Lubecki
666c87bcf4 Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e8c87f7cb3
Component: cli
 2018-06-22 13:58:39 -07:00
Sebastiaan van Stijn
a0daba149d Remove duplicated getOrchestrator(), and rename hideFlag() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e02c28f40a
Component: cli
 2018-06-22 13:58:14 -07:00
Andrew Hsu
4ba3dc6e89 Merge pull request #1137 from silvin-lubecki/stack-orchestrator 
Fix broken swarm commands with Kubernetes defined as orchestrator
Upstream-commit: 151990de62
Component: cli
 2018-06-22 13:56:42 -07:00
GordonTheTurtle
2ad83598ae Merge component 'engine' from git@github.com:docker/engine master 2018-06-22 17:04:56 +00:00
Martin Muzatko
e4b46b89eb Just satisfying my OCD - fixed comment spacing and removed a hidden character 
Signed-off-by: Martin Muzatko <martin@happy-css.com>
Upstream-commit: 7015fc03b72655e9484e68b4ec64b5fca80c68a0
Component: engine
 2018-06-22 17:17:08 +02:00
Sebastiaan van Stijn
763b3149b8 Remove shorthand -k option from docker version 
The `-k` shorthand was alreaady removed from other
commands, so best to be consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0a8598b8d
Component: cli
 2018-06-21 23:33:55 -07:00
Sebastiaan van Stijn
61fded22bf Update command usage and documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f07b9ffc7
Component: cli
 2018-06-21 23:16:27 -07:00
Sebastiaan van Stijn
a1104968c6 Remove "Stack Orchestrator" from "docker version" 
The output of this information can be confusing,
so removing until we have a better design for this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a63252ba71
Component: cli
 2018-06-21 22:02:11 -07:00
Sebastiaan van Stijn
3c9ebe0c45 Merge pull request #37293 from adshmh/migrate-TestNetworkCreateDelete-to-integration 
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
Upstream-commit: af626ba08a4e11b0e140e7512ac2740b09833c29
Component: engine
 2018-06-21 19:08:08 -07:00
Sebastiaan van Stijn
58835a016b Merge pull request #37264 from adshmh/refactor-inspect-network-integration-tests-use-network-create 
refactor network inspect integration tests to use network package
Upstream-commit: 5828df4e5fc325f872eaf33c21e28da41a3306a5
Component: engine
 2018-06-21 19:01:24 -07:00
Silvin Lubecki
4f7a346b35 Scope orchestration selection to stack commands only 
* Renaming DOCKER_ORCHESTRATOR to DOCKER_STACK_ORCHESTRATOR
* Renaming config file option "orchestrator" to "stackOrchestrator"
* "--orchestrator" flag is no more global but local to stack command and subcommands
* Cleaning all global orchestrator code
* Replicating Hidden flags in help and Supported flags from root command to stack command

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 71272dd203
Component: cli
 2018-06-21 17:12:31 -07:00
GordonTheTurtle
053dc78e66 Merge component 'engine' from git@github.com:docker/engine master 2018-06-21 17:05:30 +00:00
Arash Deshmeh
28ecd8f494 refactor network inspect integration tests to use network package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: dda4128c7ea6df5565e4ad3c0f0958a0aad547da
Component: engine
 2018-06-21 09:44:52 -04:00
Tibor Vass
a83c18a0ef Merge pull request #37313 from dmcgowan/fix-overlay2-changes 
Update overlay2 to use naive diff for changes
Upstream-commit: 093424bec097cdf51154255226cf999d6824633b
Component: engine
 2018-06-20 17:16:06 -07:00
Sebastiaan van Stijn
198a405d97 Merge pull request #37285 from adshmh/refactor-macvlan-integration-tests-network-package 
refactored remaining macvlan integration tests to use network package
Upstream-commit: 50f87331c6ea5c0ddb103bb8ab96ca26b87d61ef
Component: engine
 2018-06-20 16:35:18 -07:00
Tõnis Tiigi
e14292d034 Merge pull request #37304 from katakonst/fix_flacky_test_serviceget 
Fix flaky test TestServiceGet
Upstream-commit: fc806236e507194289eeb6a3020580de33988a24
Component: engine
 2018-06-20 16:22:14 -07:00
Arash Deshmeh
d5c5d1c094 refactored remaining macvlan integration tests to use network package for creating networks 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 1c923b28b81f22023ca8c562d359b9136efb93eb
Component: engine
 2018-06-20 17:09:26 -04:00
Catalin Pirvu
dd4bb57e39 Fix flaky test TestServiceGet 
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com>
Upstream-commit: d6a97b188da2409f562a395e6c1656d68b161494
Component: engine
 2018-06-20 22:38:29 +03:00
Derek McGowan
775daf1b72 Update overlay2 to use naive diff for changes 
The archive changes function is not implemented correctly
to handle opaque directories.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: ac5d363e67e01c769b4d9e20ed76a278434ee4de
Component: engine
 2018-06-20 11:07:36 -07:00
GordonTheTurtle
a7152c82de Merge component 'engine' from git@github.com:docker/engine master 2018-06-20 17:07:57 +00:00
Brian Goff
89094a295b Merge pull request #37315 from thaJeztah/fix_TestDaemonNoSpaceLeftOnDeviceError 
Fix TestDaemonNoSpaceLeftOnDeviceError
Upstream-commit: 62c6a8f8e5a4d412730af3499c69ac997ab0f4f2
Component: engine
 2018-06-20 08:49:12 -07:00
Brian Goff
b71fba1e62 Merge pull request #37312 from thaJeztah/update_containerd_1.1.1.rc1 
Update to containerd v1.1.1-rc.1
Upstream-commit: b29a0ab45d5690f88d244333973959d8e680f820
Component: engine
 2018-06-20 08:06:15 -07:00
Sebastiaan van Stijn
480ebf9169 Merge pull request #37294 from jstarks/lcow_caps 
lcow: Allow the client to adjust capabilities and device cgroup rules
Upstream-commit: e2593239d949eee454935daea7a5fe025477322f
Component: engine
 2018-06-19 22:14:07 -07:00