-# Attempt to login to docker.io only if $DOCKERHUB_EMAIL is configured
-if [ "${DOCKERHUB_EMAIL:-none}" != 'none' ]
-then
- do_login docker.io "$DOCKERHUB_EMAIL"
+# Login to docker.io after determining if email is needed.
+if [ "${DOCKERHUB_REGISTRY:-none}" != 'none' ]; then
+ set_creds "$DOCKERHUB_REGISTRY"
+ if [ "${DOCKERHUB_EMAIL:-none}" != 'none' ]; then
+ do_login "$DOCKERHUB_REGISTRY" "$DOCKERHUB_EMAIL"
+ else
+ do_login "$DOCKERHUB_REGISTRY" none
+ fi