Use secrets immediately

Author: Thomas Luijken

.github/actions/docker/action.yml

@@ -28,19 +28,9 @@ inputs:
   buildArgs:
     description: docker extra build arguments
     required: false
-  username:
-    description: docker container registry username
-    required: true
-  password:
-    description: docker container registry password
-    required: true
   tag:
     description: The tag to assign to this container image
     required: false
-  registry:
-    description: The container registry to push to (defaults to baseflow.azurecr.io)
-    required: false
-    default: baseflow.azurecr.io
 
 outputs:
   image:
@@ -70,9 +60,9 @@ runs:
     - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        registry: ${{steps.info.outputs.registry}}
-        username: ${{inputs.username}}
-        password: ${{inputs.password}}
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        registry: registry-1.docker.io
 
     - name: determine tag
       shell: bash

.github/workflows/BUILD_AND_DEPLOY.yml

@@ -32,22 +32,10 @@ jobs:
         run: |
           version=$(grep '^version' oxybox/Cargo.toml | head -n 1 | cut -d '"' -f2)
           echo "version=$version" >> $GITHUB_OUTPUT
-      - uses: ./.github/actions/docker
-        name: Build docker image
-        with:
-          username: ${{ secrets.BASEFLOW_ACR_USERNAME }}
-          password: ${{ secrets.BASEFLOW_ACR_PASSWORD }}
-          push: ${{ github.event_name != 'pull_request' }}
-          vulnerability_scan: ${{ github.event_name != 'pull_request' }}
-          version: ${{ steps.get_version.outputs.version }}
-          context: ./oxybox
       - uses: ./.github/actions/docker
         if: github.ref == 'refs/heads/main'
         name: Build docker image to docker hub
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          registry: registry-1.docker.io
           repository: baseflow/oxybox
           push: ${{ github.event_name != 'pull_request' }}
           vulnerability_scan: ${{ github.event_name != 'pull_request' }}
@@ -57,9 +45,6 @@ jobs:
         if: github.ref == 'refs/heads/main'
         name: Build docker image to docker hub
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          registry: registry-1.docker.io
           push: ${{ github.event_name != 'pull_request' }}
           repository: baseflow/oxybox
           vulnerability_scan: ${{ github.event_name != 'pull_request' }}