Merge "Enable docker build for cli"