Merge pull request #30065 from dnephin/fix-extends-error-message

Improve the error message for extends in stack deploy.
Upstream-commit: acaf3cf870ff6a88df5c480682046e4106e31da5
Component: engine
This commit is contained in:
Tõnis Tiigi
2017-01-11 15:27:01 -08:00
committed by GitHub

View File

@ -38,7 +38,7 @@ var DeprecatedProperties = map[string]string{
// ForbiddenProperties that are not supported in this implementation of the
// compose file.
var ForbiddenProperties = map[string]string{
"extends": "Support for `extends` is not implemented yet. Use `docker-compose config` to generate a configuration with all `extends` options resolved, and deploy from that.",
"extends": "Support for `extends` is not implemented yet.",
"volume_driver": "Instead of setting the volume driver on the service, define a volume using the top-level `volumes` option and specify the driver there.",
"volumes_from": "To share a volume between services, define it using the top-level `volumes` option and reference it from each service that shares it using the service-level `volumes` option.",
"cpu_quota": "Set resource limits using deploy.resources",