Merge pull request #23777 from jmarcet/docker-compose