action changes

Author: Tob1as

.github/actions/docker-setup/action.yml

@@ -6,6 +6,9 @@ inputs:
   git_url:
     description: "Git-URL from Workflow"
     required: false
+  git_username:
+    description: "Git-Username variable from Workflow"
+    required: false
   git_token:
     description: "Git-Token secret from Workflow"
     required: false
@@ -31,8 +34,8 @@ runs:
   using: composite
   steps:
 
-    - name: Set git_url when empty to ghcr.io registry
-      id: set_git_url
+    - name: Set default vars when empty
+      id: set_default_vars
       shell: bash
       run: |
         GIT_URL="${{ inputs.git_url }}"
@@ -41,12 +44,19 @@ runs:
         fi
         echo "GIT_URL=$GIT_URL" >> "$GITHUB_ENV"
 
+        GIT_USERNAME="${{ inputs.git_username }}"
+        if [[ -z "$GIT_USERNAME" ]]; then
+          GIT_USERNAME="${{github.repository_owner}}"
+          #GIT_USERNAME="${{github.actor}}"
+        fi
+        echo "GIT_USERNAME=$GIT_USERNAME" >> "$GITHUB_ENV"
+
     - name: Debug Variables
       id: debug
       shell: bash
       run: |
         echo "GIT_URL=${{ env.GIT_URL }}"
-        echo "\"GITHUB_USERNAME\"=${{ github.repository_owner }}"
+        echo "GIT_USERNAME=${{ env.GIT_USERNAME }}"
         echo "DOCKER_USERNAME=${{ inputs.docker_username }}"
         echo "QUAY_USERNAME=${{ inputs.quay_username }}"
 
@@ -74,14 +84,15 @@ runs:
       #  config-inline: |
       #    [registry."${{ env.GIT_URL }}"]
       #      #insecure = true
-      #      ca=["/etc/ssl/certs/ca-certificates.crt"]       
+      #      #ca=["/etc/ssl/certs/ca-certificates.crt"]
+      #      ca=["/etc/ssl/certs/fullca.crt"] 
 
     - name: Login to GIT Container Registry
-      if: env.GIT_URL != '' && github.repository_owner != '' && inputs.git_token != ''
+      if: env.GIT_URL != '' && env.GIT_USERNAME != '' && inputs.git_token != ''
       uses: docker/login-action@v3
       with:
-        registry: ${{ inputs.git_url }}
-        username: ${{ github.repository_owner }}
+        registry: ${{ env.GIT_URL }}
+        username: ${{ env.GIT_USERNAME }}
         password: ${{ inputs.git_token }}
 
     - name: Login to Docker Hub Container Registry

.github/workflows/build_docker-alpine_fpm.yml

@@ -122,6 +122,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -185,6 +186,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/build_docker-alpine_fpm_nginx.yml

@@ -123,6 +123,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -186,6 +187,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -250,6 +252,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/build_docker-debian_apache.yml

@@ -123,6 +123,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -188,6 +189,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -253,6 +255,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/build_docker-debian_fpm.yml

@@ -122,6 +122,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
@@ -185,6 +186,7 @@ jobs:
         #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
         with:
           git_url: ${{ env.GIT_URL }}
+          git_username: ${{ github.repository_owner }}
           git_token: ${{ secrets.GITHUB_TOKEN }}
           docker_username: ${{ vars.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}