fix(docker): Improve Dockerfile cache use by making build commands match exactly#6933