Merge "Add UID/GID for docker-compose"