Merge RUN commands for fewer layers
Don't include the pg cluster in data-db image