Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:rename-userpass-vars into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:master

[Sergio Durigan Junior]

Very trivial MP to rename the USERNAME/PASSWORD variables to DOCKER_USERNAME/DOCKER_PASSWORD, since they're used only for Docker.

[Bryce Harrington (bryce)]

Looks good, I checked via `grep USERNAME * -sr`.

The usage docs also have bare 'USERNAME' and 'PASSWORD' but those are in context and are just placeholders anyway.

review: Approve

diff --git a/helpers/registry-login.sh b/helpers/registry-login.sh
index fa68362..7071451 100644
--- a/helpers/registry-login.sh
+++ b/helpers/registry-login.sh
@@ -19,17 +19,17 @@ export DOCKERHUB_URL DOCKERHUB_REGISTRY_URL
 # further requests.
 _login_docker ()
 {
-    if [ -z "$USERNAME" ]; then
-	read -rp "Username: " USERNAME
+    if [ -z "$DOCKER_USERNAME" ]; then
+	read -rp "Docker username: " DOCKER_USERNAME
     fi
-    if [ -z "$PASSWORD" ]; then
-	read -rsp "Password: " PASSWORD
+    if [ -z "$DOCKER_PASSWORD" ]; then
+	read -rsp "Docker password: " DOCKER_PASSWORD
 	echo > /dev/stderr
     fi
 
     AUTH_TOKEN=$(curl -s \
 		      -H "Content-Type: application/json" \
-		      -X POST -d '{"username": "'"${USERNAME}"'", "password": "'"${PASSWORD}"'"}' \
+		      -X POST -d '{"username": "'"${DOCKER_USERNAME}"'", "password": "'"${DOCKER_PASSWORD}"'"}' \
 		      "${DOCKERHUB_URL}/v2/users/login/" | jq -r .token)
 
     if [ -z "$AUTH_TOKEN" ]; then
@@ -42,8 +42,8 @@ _login_docker ()
 	printf 'AUTH_TOKEN=%s\n' "$AUTH_TOKEN" > /dev/stderr
     fi
 
-    REGISTRY_USERNAME="$USERNAME"
-    REGISTRY_PASSWORD="$PASSWORD"
+    REGISTRY_USERNAME="$DOCKER_USERNAME"
+    REGISTRY_PASSWORD="$DOCKER_PASSWORD"
 }
 
 # Log into dockerhub's registry1, asking the user and the password.
diff --git a/list-manifest-for-image-and-tag.sh b/list-manifest-for-image-and-tag.sh
index 6f1d489..dbcf08d 100755
--- a/list-manifest-for-image-and-tag.sh
+++ b/list-manifest-for-image-and-tag.sh
@@ -97,11 +97,13 @@ validate_args ()
 	exit 1
     fi
 
-    if [ -n "$REGISTRY_USERNAME" ]; then
-	export USERNAME="$REGISTRY_USERNAME"
-    fi
-    if [ -n "$REGISTRY_PASSWORD" ]; then
-	export PASSWORD="$REGISTRY_PASSWORD"
+    if [ "${REGISTRY}" = "docker" ]; then
+        if [ -n "$REGISTRY_USERNAME" ]; then
+	    export DOCKER_USERNAME="$REGISTRY_USERNAME"
+        fi
+        if [ -n "$REGISTRY_PASSWORD" ]; then
+	    export DOCKER_PASSWORD="$REGISTRY_PASSWORD"
+        fi
     fi
 
     do_login
diff --git a/multi-arch-tagger.sh b/multi-arch-tagger.sh
index 2b63ee5..c51bb4d 100755
--- a/multi-arch-tagger.sh
+++ b/multi-arch-tagger.sh
@@ -101,11 +101,13 @@ validate_args ()
 	exit 1
     fi
 
-    if [ -n "$REGISTRY_USERNAME" ]; then
-	export USERNAME="$REGISTRY_USERNAME"
-    fi
-    if [ -n "$REGISTRY_PASSWORD" ]; then
-	export PASSWORD="$REGISTRY_PASSWORD"
+    if [ "${REGISTRY}" = "docker" ]; then
+        if [ -n "$REGISTRY_USERNAME" ]; then
+	    export DOCKER_USERNAME="$REGISTRY_USERNAME"
+        fi
+        if [ -n "$REGISTRY_PASSWORD" ]; then
+	    export DOCKER_PASSWORD="$REGISTRY_PASSWORD"
+        fi
     fi
 
     do_login
diff --git a/tag-images.sh b/tag-images.sh
index b4db4d5..c920c50 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -284,7 +284,7 @@ validate_args ()
 	unset NEW_IMAGES
     fi
 
-    _login_"${REGISTRY}"_registry1 "${IMAGES[*]}" "$USERNAME" "$PASSWORD"
+    _login_"${REGISTRY}"_registry1 "${IMAGES[*]}" "$REGISTRY_USERNAME" "$REGISTRY_PASSWORD"
 }
 
 if [ $# -lt 2 ]; then