Build CMD/ENTRYPOINT cache strings properly Upstream-commit: 70fbd45a5c88f6f39a07b04f81a07721bf5f3eed Component: engine