using straight apache secrets

Author: Trustable User

.github/workflows/image.yml

@@ -45,11 +45,11 @@ jobs:
         if:  ${{ github.event_name != 'pull_request' }}
         run: |
           echo "IMG_TAG=$(git describe --tags --abbrev=0)" >> "$GITHUB_ENV"
-      - name: Assign Custom Image Name
-        if:  ${{ github.repository_owner != 'apache'}}
-        run: |
-          echo "MY_OPERATOR_IMAGE=ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}" >> "$GITHUB_ENV"
-          echo "IMAGE_REGISTRY=ghcr.io" >> "$GITHUB_ENV"
+      #- name: Assign Custom Image Name
+      #  if:  ${{ github.repository_owner != 'apache'}}
+      #  run: |
+      #    echo "MY_OPERATOR_IMAGE=ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}" >> "$GITHUB_ENV"
+      #    echo "IMAGE_REGISTRY=ghcr.io" >> "$GITHUB_ENV"
       - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
@@ -74,14 +74,12 @@ jobs:
       #- name: Integration Test
       #  run: task itest
       #  continue-on-error: false
-      - name: Show Image Registry
-        run: echo "IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }}"
       - name: Registry login
         uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
-          registry: ${{ env.IMAGE_REGISTRY || 'registry.hub.docker.com' }}
-          username: ${{ env.IMAGE_REGISTRY == 'ghcr.io' && github.repository_owner || secrets.DOCKERHUB_USER }}
-          password: ${{ env.IMAGE_REGISTRY == 'ghcr.io' && secrets.GITHUB_TOKEN || secrets.DOCKERHUB_TOKEN }}
+          registry: 'docker.io'
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
         with: