Sebastiaan van Stijn
c26f37c0cc
Merge pull request #911 from vdemeester/update-gotestyourself
...
Update gotestyourself dependency
2018-02-28 18:07:37 +01:00
Daniel Nephin
60dcc4cdfb
Merge pull request #912 from kkirsche/patch-1
...
Fix grammar typo in comment
2018-02-28 11:58:01 -05:00
Kevin Kirsche
0e2fdc92ce
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>
2018-02-28 11:29:40 -05:00
Vincent Demeester
98ba439f67
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-28 16:11:02 +01:00
Vincent Demeester
c19b272c09
Merge pull request #909 from LydellManganti/LydellManganti-patch-1
...
Update run.md --restart to include unless-stopped
2018-02-28 14:53:49 +01:00
Lydell Manganti
d281b72a98
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>
2018-02-28 21:05:30 +10:00
Sebastiaan van Stijn
c9303404d4
Merge pull request #907 from dnephin/add-more-container-copy-tests
...
Add more container cp tests
2018-02-28 11:12:56 +01:00
Daniel Nephin
07cb69e9bc
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-27 16:38:02 -05:00
Sebastiaan van Stijn
2cc6ff131d
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
2018-02-27 19:08:53 +01:00
Vincent Demeester
a9c6c52dc0
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
2018-02-27 19:07:24 +01:00
Vincent Demeester
2851c007fe
Merge pull request #898 from silvin-lubecki/add-stack-to-version-command
...
Print Stack API and Kubernetes versions in version command
2018-02-27 17:14:55 +01:00
Vincent Demeester
31dc5c0a9a
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>
2018-02-27 12:14:07 +01:00
Vincent Demeester
750b038707
Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy
...
add support for mandatory variables to stack deploy
2018-02-27 10:25:22 +01:00
Arash Deshmeh
5d8ce59a25
fix the error message in Substitute function
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-02-26 15:29:17 -05:00
Arash Deshmeh
e33bc48752
Added error message check to TestMandatoryVariableErrors test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-02-26 15:29:17 -05:00
Daniel Nephin
ce544823b6
Refactor substitute to reduce cyclo complexity
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-26 15:29:17 -05:00
Arash Deshmeh
99ecf57c6c
added support for mandatory variables to cli/compose
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-02-26 15:29:17 -05:00
Sebastiaan van Stijn
2813fae8f9
Merge pull request #900 from AkihiroSuda/sctp-doc
...
docs: mention sctp
2018-02-26 11:28:44 +01:00
Sebastiaan van Stijn
71039d0486
Merge pull request #901 from thaJeztah/bump-version-to-v18.04-dev
...
Bump VERSION to 18.04.0-dev
2018-02-26 11:25:43 +01:00
Sebastiaan van Stijn
06dd62ab1e
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>
2018-02-26 11:06:07 +01:00
Akihiro Suda
b85d87b8ab
docs: mention sctp
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-26 15:27:11 +09:00
Silvin Lubecki
854aad8927
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>
2018-02-26 01:16:49 +01:00
shhsu@microsoft.com
8883cd636a
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>
2018-02-22 09:14:51 -08:00
Vincent Demeester
ef7d8be86c
Merge pull request #896 from thaJeztah/templated-configs-secrets
...
Add --template-driver option for secrets/configs
2018-02-22 09:44:16 +01:00
Sebastiaan van Stijn
84c7dd6057
Merge pull request #843 from sepich/docs-for-pr33130
...
Document long form of --network and --network-add
2018-02-21 23:26:39 +01:00
Sebastiaan van Stijn
d11b5ccdfa
Add --template-driver option for secrets/configs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 23:22:32 +01:00
Sebastiaan van Stijn
50b229f533
Merge pull request #897 from thaJeztah/update-authors2
...
Update authors
2018-02-21 21:28:36 +01:00
Sebastiaan van Stijn
ec92c08874
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 20:53:40 +01:00
Daniel Nephin
0e81cddd95
Merge pull request #884 from shin-/update_3.6_schema_id
...
Fix typo in 3.6 schema ID
2018-02-21 14:49:43 -05:00
Joffrey F
56f26d1134
Fix typo in 3.6 schema ID
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 19:55:12 +01:00
Daniel Nephin
cea4d37bca
Merge pull request #824 from ethan-haynes/820-bind-mount-source-missing-error
...
added check for empty source in bind mount
2018-02-21 13:33:24 -05:00
Daniel Nephin
a160ad89c9
Merge pull request #894 from thaJeztah/update-moby
...
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
2018-02-21 13:15:58 -05:00
Sebastiaan van Stijn
88ee1a67f4
Merge pull request #895 from vdemeester/simplify-yaml-marshal
...
Simplify the marshaling of compose types.Config
2018-02-21 19:02:04 +01:00
Sebastiaan van Stijn
60930d309c
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>
2018-02-21 18:48:42 +01:00
Vincent Demeester
cf86a4d922
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>
2018-02-21 18:47:10 +01:00
Daniel Nephin
939938b976
Merge pull request #891 from vdemeester/k8s-loader-make-sure-version
...
Make sure we marshall version too…
2018-02-21 11:45:14 -05:00
Vincent Demeester
9f9f1c8515
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>
2018-02-21 15:36:51 +01:00
Vincent Demeester
64f92fd07c
Merge pull request #278 from ishidawataru/sctp
...
Support SCTP port mapping
2018-02-21 09:29:36 +01:00
Wataru Ishida
995006c164
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>
2018-02-21 12:19:38 +09:00
Brian Goff
5730ef8ea0
Merge pull request #874 from dnephin/replace-go-bindata
...
Replace go-bindata with esc
2018-02-20 17:00:22 -05:00
Vincent Demeester
82a8085885
Merge pull request #886 from thaJeztah/dockerfile-outside-context
...
Allow Dockerfile from outside build-context
2018-02-20 19:56:16 +01:00
Vincent Demeester
02e8dc6bfc
Merge pull request #892 from thaJeztah/bump-moby-vendor
...
Bump moby vendor and dependencies
2018-02-20 18:54:55 +01:00
Vincent Demeester
1e8530bc34
Merge pull request #885 from thaJeztah/node-engine-version
...
Add Engine version to docker node ls
2018-02-20 18:45:36 +01:00
Sebastiaan van Stijn
3c24e5ce12
Bump swarmkit to f74983e7c015a38a81c8642803a78b8322cf7eac
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 18:07:28 +01:00
Sebastiaan van Stijn
58e29ec11e
Update github.com/containerd/continuity
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 18:03:37 +01:00
Sebastiaan van Stijn
e17a680f01
bump runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:58:11 +01:00
Sebastiaan van Stijn
88874b5eff
Update go-connections to 7beb39f0b969b075d1325fecb092faf27fd357b6
...
- Support parsing SCTP port mapping
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:45:42 +01:00
Sebastiaan van Stijn
d9f5fa8124
update golang.org/x/sys for OpenBSD
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:40:06 +01:00
Daniel Nephin
bbe7f84540
Merge pull request #264 from thaJeztah/carry-moby-32803
...
Update docker kill reference docs
2018-02-20 11:19:59 -05:00
Sebastiaan van Stijn
aaa7a7cb95
Bump docker/docker to 079ed017b61eb819b8184b90013ce89465d3aaba
...
- Add API support for SCTP port mapping
- Add canonical import path
- Add `REMOVE` and `ORPHANED` to TaskState
- Fix TLS from environment variables in client
- Introduce NewClientWithOpts func to build custom client easily
- Wrap response errors for container copy methodsto fix error detection using
`IsErrNotFound` and `IsErrNotImplemented` for `ContainerStatPath`,
`CopyFromContainer`, and `CopyToContainer` methods.
- Produce errors when empty ids are passed into inspect calls
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:17:49 +01:00