Consolidate Dockerfiles

Consolidate Dockerfiles for psql client and full image.