search

signalfx / maestro-ng

Orchestration of Docker-based, multi-host environments
https://signalfx.com
Apache License 2.0
685 stars 83 forks source link

Added support for ship defaults for TLS parameters. (Fixes #185) #192

Closed zsuzhengdu closed 7 years ago

mpetazzoni commented 7 years ago

Awesome! Thanks a lot! Is there any changes to the documentation that's needed along with those improvements? Especially around using credentials for docker registries, since username/password are no longer required directly in the Maestro YAML file.

zsuzhengdu commented 7 years ago

Both $HOME/.dockercfg and $HOME/.docker/config.json is supported by auth.py in docker-py https://github.com/docker/docker-py/blob/master/docker/auth.py#L14

If needed mentioned support for $HOME/.docker/config.json, which was introduced in https://github.com/docker/docker/commit/18c9b6c6455f116ae59cde8544413b3d7d294a5e, in http://maestro-ng.readthedocs.io/en/latest/registries.html, my pleasure to do.

This PR supports cases either username provided or not and the case of wrong username provided as 

registries:
    valid_registry:
        registry: valid_registry # pickup username from docker config
    valid_registry:
        registry: valid_registry # pickup username from docker config
        username: valid_username
    valid_registry:
        registry: valid_registry
        username: wrong_username
    invaild_registry:
        registry: invaild_registry  # Login failure
mpetazzoni commented 7 years ago

Looks like the doc has it covered already then. Thanks, merging!