Refactor action.yml and README.md to standardize registry input names, improving clarity and consistency in authentication for multiple registries.

Author: jaydrogers

README.md

@@ -51,12 +51,15 @@ jobs:
   docker-publish:
     runs-on: ubuntu-24.04
     steps:
-      - name: docker-build-action
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Build and push Docker image
         uses: serversideup/github-action-docker-build@v6
         with:
           tags: serversideup/financial-freedom:latest
           registry-username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          registry-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          registry-password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
           platforms: "linux/amd64,linux/arm/v7,linux/arm64/v8"
 ```
 
@@ -89,17 +92,17 @@ jobs:
           # Registry 1: Docker Hub
           registry: "docker.io"
           registry-username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          registry-token: ${{ secrets.DOCKER_HUB_TOKEN }}
+          registry-password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
           # Registry 2: GitHub Container Registry
           registry-2: "ghcr.io"
-          registry-username-2: ${{ github.actor }}
-          registry-password-2: ${{ secrets.GITHUB_TOKEN }}
+          registry-2-username: ${{ github.actor }}
+          registry-2-password: ${{ secrets.GITHUB_TOKEN }}
 
           # Registry 3: Custom Private Registry
           registry-3: "registry.example.com"
-          registry-username-3: ${{ secrets.CUSTOM_REGISTRY_USER }}
-          registry-password-3: ${{ secrets.CUSTOM_REGISTRY_TOKEN }}
+          registry-3-username: ${{ secrets.CUSTOM_REGISTRY_USER }}
+          registry-3-password: ${{ secrets.CUSTOM_REGISTRY_TOKEN }}
 
           platforms: "linux/amd64,linux/arm64"
 ```
@@ -111,9 +114,9 @@ jobs:
 tags|Enter the tag(s) you would like to name your image with. (example: `myorg/myapp:production`) Use multi-line format for multiple tags.|⚠️ Yes| 
 registry|Choose which container image repository to upload to. <a href="https://github.com/docker/login-action#usage">See all options.</a>| |`docker.io`
 registry-username|Enter the username to authenticate with your first registry.|⚠️ Yes| 
-registry-token (deprecated)| Use `registry-password` instead||
 registry-password|Enter the password or token to authenticate with your registry. (an access token is highly recommended)|⚠️ Yes|  
-context|The relative path to the Dockerfile.| |`.`
+registry-token (deprecated)| Use `registry-password` instead||
+context|The build context directory (the directory containing your Dockerfile and build files).| |`.`
 dockerfile|Filename of the Dockerfile within the context that you set.| |`./Dockerfile`
 platforms|Comma separated list of <a href="https://github.com/docker-library/official-images#architectures-other-than-amd64">platforms</a>.| |`linux/amd64`
 target|The target build stage to build.| |
@@ -122,11 +125,11 @@ target|The target build stage to build.| |
 **🔀 Input Name**|**📚 Description**|**🛑 Required**|**👉 Default**
 :-----:|:-----:|:-----:|:-----:
 registry-2|Choose which container image repository to upload to. <a href="https://github.com/docker/login-action#usage">See all options.</a>| |
-registry-username-2|Enter the username to authenticate with your second registry.|⚠️ Yes (if you use the 2nd registry)| 
-registry-password-2|Enter the token or password to authenticate with your second registry. (an access token is highly recommended)|⚠️ Yes (if you use the 2nd registry)|  
+registry-2-username|Enter the username to authenticate with your second registry.|⚠️ Yes (if you use the 2nd registry)| 
+registry-2-password|Enter the token or password to authenticate with your second registry. (an access token is highly recommended)|⚠️ Yes (if you use the 2nd registry)|  
 registry-3|Choose which container image repository to upload to. <a href="https://github.com/docker/login-action#usage">See all options.</a>| |
-registry-username-3|Enter the username to authenticate with your third registry.|⚠️ Yes (if you use the 3rd registry)| 
-registry-password-3|Enter the token or password to authenticate with your third registry. (an access token is highly recommended)|⚠️ Yes (if you use the 3rd registry)|  
+registry-3-username|Enter the username to authenticate with your third registry.|⚠️ Yes (if you use the 3rd registry)| 
+registry-3-password|Enter the token or password to authenticate with your third registry. (an access token is highly recommended)|⚠️ Yes (if you use the 3rd registry)|  
 
 > [!NOTE]  
 > At least one registry's credentials must be provided (either registry 1, 2, or 3).

action.yml

@@ -17,24 +17,24 @@ inputs:
     description: 'Registry to authenticate with (e.g., "docker.io" or "ghcr.io").'
     default: 'docker.io' # Default to Docker Hub if not specified
     required: false
-  registry-username-2:
+  registry-2:
+    description: 'Registry to authenticate with (e.g., "docker.io" or "ghcr.io").'
+  registry-2-username:
     description: 'Enter the username to authenticate with your registry.'
     default: ''
-  registry-password-2:
+  registry-2-password:
     description: 'Enter the token or password to authenticate with your registry. (an access token is highly recommended)'
     default: ''
-  registry-2:
+  registry-3:
     description: 'Registry to authenticate with (e.g., "docker.io" or "ghcr.io").'
-  registry-username-3:
+  registry-3-username:
     description: 'Enter the username to authenticate with your registry.'
     default: ''
-  registry-password-3:
+  registry-3-password:
     description: 'Enter the token or password to authenticate with your registry. (an access token is highly recommended)'
     default: ''
-  registry-3:
-    description: 'Registry to authenticate with (e.g., "docker.io" or "ghcr.io").'
   context:
-    description: 'The relative path to the Dockerfile.'
+    description: 'The build context directory (the directory containing your Dockerfile and build files).'
     default: '.'
     required: false
   dockerfile:
@@ -53,27 +53,27 @@ runs:
   using: 'composite'
   steps:
 
-      - name: Login to Container Registry ({{ inputs.registry }})
+      - name: Login to Container Registry
         uses: docker/login-action@v3
         with:
           username: ${{ inputs.registry-username }}
           password: ${{ inputs.registry-password || inputs.registry-token }}
           registry: ${{ inputs.registry }}
 
-      - name: "Login to Container Registry #2 ({{ inputs.registry-2 }})"
+      - name: "Login to Container Registry #2"
         if: inputs.registry-2-username != ''
         uses: docker/login-action@v3
         with:
-          username: ${{ inputs.registry-username-2 }}
-          password: ${{ inputs.registry-password-2 }}
+          username: ${{ inputs.registry-2-username }}
+          password: ${{ inputs.registry-2-password }}
           registry: ${{ inputs.registry-2 }}
 
-      - name: "Login to Container Registry #3 ({{ inputs.registry-3 }})"
+      - name: "Login to Container Registry #3"
         if: inputs.registry-3-username != ''
         uses: docker/login-action@v3
         with:
-          username: ${{ inputs.registry-username-3 }}
-          password: ${{ inputs.registry-password-3 }}
+          username: ${{ inputs.registry-3-username }}
+          password: ${{ inputs.registry-3-password }}
           registry: ${{ inputs.registry-3 }}
 
       - name: Set up QEMU