From 9f1fcd347b5dc0e117b3d38c2db1c3bd02bd0350 Mon Sep 17 00:00:00 2001
From: Candace Savonen <cansav09@gmail.com>
Date: Tue, 7 Jan 2025 17:00:15 -0500
Subject: [PATCH] Update composite action

---
 .github/workflows/action.yml | 53 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 45d5601..a14192d 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -1,32 +1,31 @@
 # Candace Savonen Apr 2022
 
 name: Build Docker Image
-
+description: "Build and push from a dockerfile in the repository"
 on:
-  workflow_call:
-    inputs:
-      directory:
-        description: 'What's the file path to this Dockerfile's folder in this repo'
-        required: true
-        type: string
-      tag:
-        description: 'What is this called on Dockerhub? e.g. jhudsl/base_ottr'
-        required: true
-        type: string
-      dockerhubpush:
-        description: 'Should this be pushed to Dockerhub?'
-        required: false
-        default: 'false'
-        type: string
-      token:
-        description: 'A GitHub Personal Access Token'
-        required: false
-      dockerhub_username:
-        description: 'A Dockerhub username that has access to this image'
-        required: false
-      dockerhub_token:
-        description: 'A Dockerhub token that has persmissions to push to this image'
-        required: false
+inputs:
+  directory:
+    description: 'What's the file path to this Dockerfile's folder in this repo'
+    required: true
+    type: string
+  tag:
+    description: 'What is this called on Dockerhub? e.g. jhudsl/base_ottr'
+    required: true
+    type: string
+  dockerhubpush:
+    description: 'Should this be pushed to Dockerhub?'
+    required: false
+    default: 'false'
+    type: string
+  token:
+    description: 'A GitHub Personal Access Token'
+    required: false
+  dockerhub_username:
+    description: 'A Dockerhub username that has access to this image'
+    required: false
+  dockerhub_token:
+    description: 'A Dockerhub token that has persmissions to push to this image'
+    required: false
 
 runs:
   using: "composite"
@@ -44,8 +43,8 @@ runs:
       if: ${{ inputs.dockerhubpush != 'false' }}
       uses: docker/login-action@v3
       with:
-        username: ${{ inputs.DOCKERHUB_USERNAME }}
-        password: ${{ inputs.DOCKERHUB_TOKEN }}
+        username: ${{ inputs.dockerhub_username }}
+        password: ${{ inputs.dockerhub_token }}
 
     - name: Build
       uses: docker/build-push-action@v6