refactor

(cherry picked from commit eeb47d5)

Author: Haarolean

.github/workflows/docker_publish.yml

@@ -79,19 +79,12 @@ jobs:
 
       - name: Define env vars for container registry URL
         run: |
-          if [ ${{ matrix.registry }} == 'public.ecr.aws' ]; then
-            # vars.ECR_REGISTRY value is expected to be of the `public.ecr.aws/<public_ecr_id>` form
-            # The `public_ecr_id` must be a *default* alias associated with public regsitry (rather
-            # than a custom alias)
+          if [ ${{ matrix.registry }} == 'ecr' ]; then
             echo "REGISTRY=${{ vars.ECR_REGISTRY }}" >> $GITHUB_ENV
-            # Trim GH Org name so that resulting Public ECR URL has no duplicate org name
-            # Public ECR default alias: public.ecr.aws/<public_ecr_id>/kafka-ui
-            # Public ECR custom alias:  public.ecr.aws/kafbat/kafka-ui
-            echo "REPOSITORY=$(basename ${{ github.repository }})" >> $GITHUB_ENV
-          else # this covers the case of docker.io and ghcr.io
+          else
             echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
-            echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
           fi
+          echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
 
       - name: Push images to ${{ matrix.registry }}
         run: |