607f04235c
man/docker-run.1: fix --interactive
...
Do not mention the default value twice.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: c2670c59fb
2018-03-06 14:34:31 -08:00
ce28b1a891
man/docker-run.1: fix --device and --cgroup-device-rule
...
Use the proper man typesetting when describing the options
(i.e. use italics for variable parts, bold for literals).
Expand the description. Give better examples. Refer to mknod(2).
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 70dea5c144
2018-03-06 14:33:22 -08:00
6dbf483853
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 681c921528
2018-03-06 14:38:35 -05:00
2625498b94
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 789acb526c
2018-03-06 13:44:06 -05:00
a6a881dbc7
Don't set a default filename for ConfigFile
...
With a default filename tests will leave a file in the working directory
that is never cleaned up.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7c8b5708eb
2018-03-06 13:32:50 -05:00
e38d9c1064
Merge pull request #879 from dnephin/update-assertions
...
Replace testify assertions with gotestyourself/assert
Upstream-commit: a0b19f0ec2
2018-03-06 17:19:51 +01:00
146b9fed38
Post migration fixes
...
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5155cda716
2018-03-05 19:41:17 -05:00
ad1a2c9e1d
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 39c2ca57c1
2018-03-05 19:41:17 -05:00
40f9f0a5c0
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ef8835f23
2018-03-05 19:41:14 -05:00
9ccbb57610
Update some assertions.
...
and fix some tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 93615dd967
2018-03-05 17:15:24 -05:00
d8679c544e
Use new APIClient interface
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cff874122c
2018-03-05 16:34:22 -05:00
060165553c
Merge pull request #911 from vdemeester/update-gotestyourself
...
Update gotestyourself dependency
Upstream-commit: c26f37c0cc
2018-02-28 18:07:37 +01:00
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
2018-02-28 11:29:40 -05:00
919ca49c30
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 98ba439f67
2018-02-28 16:11:02 +01:00
7c89f9b56b
Merge pull request #909 from LydellManganti/LydellManganti-patch-1
...
Update run.md --restart to include unless-stopped
Upstream-commit: c19b272c09
2018-02-28 14:53:49 +01:00
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
2018-02-28 21:05:30 +10:00
697a64b33e
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07cb69e9bc
2018-02-27 16:38:02 -05:00
be84720c48
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d
2018-02-27 19:08:53 +01:00
afdaedaad3
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
Upstream-commit: a9c6c52dc0
2018-02-27 19:07:24 +01:00
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
2018-02-27 17:14:55 +01:00
70e2992847
Fix --label behavior on run
...
Commit 2b17f4c8a8vincent@sbr.pm >
Upstream-commit: 31dc5c0a9a
2018-02-27 12:14:07 +01:00
38e7824f05
fix the error message in Substitute function
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5d8ce59a25
2018-02-26 15:29:17 -05:00
bb11b4e9b1
Added error message check to TestMandatoryVariableErrors test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: e33bc48752
2018-02-26 15:29:17 -05:00
41c5444dac
Refactor substitute to reduce cyclo complexity
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ce544823b6
2018-02-26 15:29:17 -05:00
99c3d5bb04
added support for mandatory variables to cli/compose
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 99ecf57c6c
2018-02-26 15:29:17 -05:00
8fee7710b7
Merge pull request #900 from AkihiroSuda/sctp-doc
...
docs: mention sctp
Upstream-commit: 2813fae8f9
2018-02-26 11:28:44 +01:00
9f5c7766d0
Bump VERSION to 18.04.0-dev
...
The Docker 18.03 branch was cut from
CLI: 84c7dd6057github@gone.nl >
Upstream-commit: 06dd62ab1e
2018-02-26 11:06:07 +01:00
faa59fb288
docs: mention sctp
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b85d87b8ab
2018-02-26 15:27:11 +09:00
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
2018-02-26 01:16:49 +01:00
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
2018-02-22 09:14:51 -08:00
9963a034b3
Merge pull request #896 from thaJeztah/templated-configs-secrets
...
Add --template-driver option for secrets/configs
Upstream-commit: ef7d8be86c
2018-02-22 09:44:16 +01:00
acea77d537
Merge pull request #843 from sepich/docs-for-pr33130
...
Document long form of --network and --network-add
Upstream-commit: 84c7dd6057
2018-02-21 23:26:39 +01:00
3b6356337c
Add --template-driver option for secrets/configs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d11b5ccdfa
2018-02-21 23:22:32 +01:00
da1330b479
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ec92c08874
2018-02-21 20:53:40 +01:00
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
2018-02-21 19:55:12 +01:00
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
2018-02-21 13:33:24 -05:00
6e4091ce84
Merge pull request #894 from thaJeztah/update-moby
...
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
Upstream-commit: a160ad89c9
2018-02-21 13:15:58 -05:00
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
2018-02-21 18:48:42 +01:00
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
2018-02-21 18:47:10 +01:00
912355fce6
Merge pull request #891 from vdemeester/k8s-loader-make-sure-version
...
Make sure we marshall version too…
Upstream-commit: 939938b976
2018-02-21 11:45:14 -05:00
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
2018-02-21 15:36:51 +01:00
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
2018-02-21 12:19:38 +09:00
4b504a390c
Merge pull request #874 from dnephin/replace-go-bindata
...
Replace go-bindata with esc
Upstream-commit: 5730ef8ea0
2018-02-20 17:00:22 -05:00
c2d1fda268
Merge pull request #886 from thaJeztah/dockerfile-outside-context
...
Allow Dockerfile from outside build-context
Upstream-commit: 82a8085885
2018-02-20 19:56:16 +01:00
4f56c06e93
Merge pull request #892 from thaJeztah/bump-moby-vendor
...
Bump moby vendor and dependencies
Upstream-commit: 02e8dc6bfc
2018-02-20 18:54:55 +01:00
81f2f8b4a0
Merge pull request #885 from thaJeztah/node-engine-version
...
Add Engine version to docker node ls
Upstream-commit: 1e8530bc34
2018-02-20 18:45:36 +01:00
8439f579a2
Bump swarmkit to f74983e7c015a38a81c8642803a78b8322cf7eac
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c24e5ce12
2018-02-20 18:07:28 +01:00
d34627d1e8
Update github.com/containerd/continuity
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 58e29ec11e
2018-02-20 18:03:37 +01:00
7a139c4f49
bump runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e17a680f01
2018-02-20 17:58:11 +01:00
6e43a54340
Update go-connections to 7beb39f0b969b075d1325fecb092faf27fd357b6
...
- Support parsing SCTP port mapping
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 88874b5eff
2018-02-20 17:45:42 +01:00
