Daniel Nephin
40f9f0a5c0
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ef8835f23
Component: cli
2018-03-05 19:41:14 -05:00
Daniel Nephin
9ccbb57610
Update some assertions.
...
and fix some tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 93615dd967
Component: cli
2018-03-05 17:15:24 -05:00
Sebastiaan van Stijn
060165553c
Merge pull request #911 from vdemeester/update-gotestyourself
...
Update gotestyourself dependency
Upstream-commit: c26f37c0cc
Component: cli
2018-02-28 18:07:37 +01:00
Daniel Nephin
c2ab7d89c3
Merge pull request #912 from kkirsche/patch-1
...
Fix grammar typo in comment
Upstream-commit: 60dcc4cdfb
Component: cli
2018-02-28 11:58:01 -05:00
Kevin Kirsche
e11e04d02b
Fix grammar typo in comment
...
Overriding is the incorrect part of speech for this sentence. It is more common to state that the values are overridden instead.
Other options would include:
```golang
// ldflags is overriding these values
```
```golang
// These values will be overridden by ldflags
```
etc.
Signed-off-by: Kevin Kirsche <kevin.kirsche@verizon.com >
Upstream-commit: 0e2fdc92ce
Component: cli
2018-02-28 11:29:40 -05:00
Vincent Demeester
919ca49c30
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 98ba439f67
Component: cli
2018-02-28 16:11:02 +01:00
Vincent Demeester
7c89f9b56b
Merge pull request #909 from LydellManganti/LydellManganti-patch-1
...
Update run.md --restart to include unless-stopped
Upstream-commit: c19b272c09
Component: cli
2018-02-28 14:53:49 +01:00
Lydell Manganti
63f4daf361
Update run.md --restart to include unless-stopped
...
Update --restart option to include unless-stopped to be consistent with https://docs.docker.com/config/containers/start-containers-automatically/#use-a-restart-policy
Signed-off-by: Lydell Manganti <lydell.manganti@gmail.com >
Upstream-commit: d281b72a98
Component: cli
2018-02-28 21:05:30 +10:00
Sebastiaan van Stijn
1d9d1d8c5e
Merge pull request #907 from dnephin/add-more-container-copy-tests
...
Add more container cp tests
Upstream-commit: c9303404d4
Component: cli
2018-02-28 11:12:56 +01:00
Daniel Nephin
697a64b33e
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07cb69e9bc
Component: cli
2018-02-27 16:38:02 -05:00
Sebastiaan van Stijn
be84720c48
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d
Component: cli
2018-02-27 19:08:53 +01:00
Vincent Demeester
afdaedaad3
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
Upstream-commit: a9c6c52dc0
Component: cli
2018-02-27 19:07:24 +01:00
Vincent Demeester
37ba7892be
Merge pull request #898 from silvin-lubecki/add-stack-to-version-command
...
Print Stack API and Kubernetes versions in version command
Upstream-commit: 2851c007fe
Component: cli
2018-02-27 17:14:55 +01:00
Vincent Demeester
70e2992847
Fix --label behavior on run
...
Commit 2b17f4c8a8 fixed the way empty labels
are taken into account (i.e. not interpolated from environment variable),
but it created a regression.
`ValidateLabel` functions doesn't allow empty label value, but it has
always been possible to pass an empty label via the cli (`docker run --label foo`).
This fixes that by not validating the label flag.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 31dc5c0a9a
Component: cli
2018-02-27 12:14:07 +01:00
Vincent Demeester
b1748ad25c
Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy
...
add support for mandatory variables to stack deploy
Upstream-commit: 750b038707
Component: cli
2018-02-27 10:25:22 +01:00
Arash Deshmeh
38e7824f05
fix the error message in Substitute function
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5d8ce59a25
Component: cli
2018-02-26 15:29:17 -05:00
Arash Deshmeh
bb11b4e9b1
Added error message check to TestMandatoryVariableErrors test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: e33bc48752
Component: cli
2018-02-26 15:29:17 -05:00
Daniel Nephin
41c5444dac
Refactor substitute to reduce cyclo complexity
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ce544823b6
Component: cli
2018-02-26 15:29:17 -05:00
Arash Deshmeh
99c3d5bb04
added support for mandatory variables to cli/compose
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 99ecf57c6c
Component: cli
2018-02-26 15:29:17 -05:00
Sebastiaan van Stijn
8fee7710b7
Merge pull request #900 from AkihiroSuda/sctp-doc
...
docs: mention sctp
Upstream-commit: 2813fae8f9
Component: cli
2018-02-26 11:28:44 +01:00
Sebastiaan van Stijn
f49d1f63d7
Merge pull request #901 from thaJeztah/bump-version-to-v18.04-dev
...
Bump VERSION to 18.04.0-dev
Upstream-commit: 71039d0486
Component: cli
2018-02-26 11:25:43 +01:00
Sebastiaan van Stijn
9f5c7766d0
Bump VERSION to 18.04.0-dev
...
The Docker 18.03 branch was cut from
CLI: 84c7dd6057
Engine: fb005971c2bd82de482d1cfe924f2f4ec60c60ae
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06dd62ab1e
Component: cli
2018-02-26 11:06:07 +01:00
Akihiro Suda
faa59fb288
docs: mention sctp
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b85d87b8ab
Component: cli
2018-02-26 15:27:11 +09:00
Silvin Lubecki
d3e338ece5
Print Stack API version in version command
...
* Resolve Stack API using Kubernetes discovering API
* Refactor Kubernetes flags parsing
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 854aad8927
Component: cli
2018-02-26 01:16:49 +01:00
shhsu@microsoft.com
1b83ee58c9
Silent login: if user did not provide -u and -p flag for login command but both username and password are retrieved in cred store, docker will automatically use the credentials found in the cred store to log in
...
Signed-off-by: shhsu@microsoft.com <shhsu@microsoft.com >
Signed-off-by: Peter Hsu <shhsu@microsoft.com >
Signed-off-by: shhsu <shhsu@microsoft.com >
Signed-off-by: Peter Hsu <shhsu@microsoft.com >
Upstream-commit: 8883cd636a
Component: cli
2018-02-22 09:14:51 -08:00
Vincent Demeester
9963a034b3
Merge pull request #896 from thaJeztah/templated-configs-secrets
...
Add --template-driver option for secrets/configs
Upstream-commit: ef7d8be86c
Component: cli
2018-02-22 09:44:16 +01:00
Sebastiaan van Stijn
acea77d537
Merge pull request #843 from sepich/docs-for-pr33130
...
Document long form of --network and --network-add
Upstream-commit: 84c7dd6057
Component: cli
2018-02-21 23:26:39 +01:00
Sebastiaan van Stijn
3b6356337c
Add --template-driver option for secrets/configs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d11b5ccdfa
Component: cli
2018-02-21 23:22:32 +01:00
Sebastiaan van Stijn
706ded458f
Merge pull request #897 from thaJeztah/update-authors2
...
Update authors
Upstream-commit: 50b229f533
Component: cli
2018-02-21 21:28:36 +01:00
Sebastiaan van Stijn
da1330b479
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ec92c08874
Component: cli
2018-02-21 20:53:40 +01:00
Daniel Nephin
f8157dd468
Merge pull request #884 from shin-/update_3.6_schema_id
...
Fix typo in 3.6 schema ID
Upstream-commit: 0e81cddd95
Component: cli
2018-02-21 14:49:43 -05:00
Joffrey F
86c5b9760f
Fix typo in 3.6 schema ID
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 56f26d1134
Component: cli
2018-02-21 19:55:12 +01:00
Daniel Nephin
da2e766ea9
Merge pull request #824 from ethan-haynes/820-bind-mount-source-missing-error
...
added check for empty source in bind mount
Upstream-commit: cea4d37bca
Component: cli
2018-02-21 13:33:24 -05:00
Daniel Nephin
6e4091ce84
Merge pull request #894 from thaJeztah/update-moby
...
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
Upstream-commit: a160ad89c9
Component: cli
2018-02-21 13:15:58 -05:00
Sebastiaan van Stijn
8878228a1f
Merge pull request #895 from vdemeester/simplify-yaml-marshal
...
Simplify the marshaling of compose types.Config
Upstream-commit: 88ee1a67f4
Component: cli
2018-02-21 19:02:04 +01:00
Sebastiaan van Stijn
8254c65c9b
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
...
Includes:
- [client] Remove duplicate NewClient functions
- Add API support for templated secrets and configs
- Adjust minimum API version for templated configs/secrets
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60930d309c
Component: cli
2018-02-21 18:48:42 +01:00
Vincent Demeester
239936c7e1
Simplify the marshaling of compose types.Config
...
- Add `Version` to `types.Config`
- Add a new `Services` types (that is just `[]ServiceConfig`) and add
`MarshalYAML` method on it.
- Clean other top-level custom marshaling as `Services` is the only one
required.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cf86a4d922
Component: cli
2018-02-21 18:47:10 +01:00
Daniel Nephin
912355fce6
Merge pull request #891 from vdemeester/k8s-loader-make-sure-version
...
Make sure we marshall version too…
Upstream-commit: 939938b976
Component: cli
2018-02-21 11:45:14 -05:00
Vincent Demeester
3ed0ebb0b5
Make sure we marshall version too…
...
… otherwise the k8s controller might fail to parse the file as it will
think it's version 1.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9f9f1c8515
Component: cli
2018-02-21 15:36:51 +01:00
Vincent Demeester
53fd7b9026
Merge pull request #278 from ishidawataru/sctp
...
Support SCTP port mapping
Upstream-commit: 64f92fd07c
Component: cli
2018-02-21 09:29:36 +01:00
Wataru Ishida
894af8d548
Support SCTP port mapping
...
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp >
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 995006c164
Component: cli
2018-02-21 12:19:38 +09:00
Brian Goff
4b504a390c
Merge pull request #874 from dnephin/replace-go-bindata
...
Replace go-bindata with esc
Upstream-commit: 5730ef8ea0
Component: cli
2018-02-20 17:00:22 -05:00
Vincent Demeester
c2d1fda268
Merge pull request #886 from thaJeztah/dockerfile-outside-context
...
Allow Dockerfile from outside build-context
Upstream-commit: 82a8085885
Component: cli
2018-02-20 19:56:16 +01:00
Vincent Demeester
4f56c06e93
Merge pull request #892 from thaJeztah/bump-moby-vendor
...
Bump moby vendor and dependencies
Upstream-commit: 02e8dc6bfc
Component: cli
2018-02-20 18:54:55 +01:00
Vincent Demeester
81f2f8b4a0
Merge pull request #885 from thaJeztah/node-engine-version
...
Add Engine version to docker node ls
Upstream-commit: 1e8530bc34
Component: cli
2018-02-20 18:45:36 +01:00
Sebastiaan van Stijn
8439f579a2
Bump swarmkit to f74983e7c015a38a81c8642803a78b8322cf7eac
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c24e5ce12
Component: cli
2018-02-20 18:07:28 +01:00
Sebastiaan van Stijn
d34627d1e8
Update github.com/containerd/continuity
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 58e29ec11e
Component: cli
2018-02-20 18:03:37 +01:00
Sebastiaan van Stijn
7a139c4f49
bump runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e17a680f01
Component: cli
2018-02-20 17:58:11 +01:00
Sebastiaan van Stijn
6e43a54340
Update go-connections to 7beb39f0b969b075d1325fecb092faf27fd357b6
...
- Support parsing SCTP port mapping
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 88874b5eff
Component: cli
2018-02-20 17:45:42 +01:00
Sebastiaan van Stijn
434d9d7ac3
update golang.org/x/sys for OpenBSD
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d9f5fa8124
Component: cli
2018-02-20 17:40:06 +01:00