The variables... didn't make much sense.  (I mean, their history is an
interesting mash-up of GitLab's naming for secondary containers and
Docker "links", but still.)

Here we drop the old ones, and start using the same ones the postgres
image uses.  (Hopefully this will cut down on duplicated configuration,
as well.)