Merge branch 'enhancement/revise_docker_env' into 'master'

Enhancement/revise docker env

See merge request !11
2 jobs for v0.18.7 in 12 minutes and 21 seconds (queued for 1 second)
latest