Consolidate Dockerfile to reduce layer count