Fix: Build invalid reference format

CaddyBuilds · May 28, 2024 · f6bf0e0 · f6bf0e0
1 parent 93290e4
commit f6bf0e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/build-docker-image-alpine.yml b/.github/workflows/build-docker-image-alpine.yml
@@ -36,9 +36,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Convert repository owner to lowercase
-        run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
-
       - name: Set version if empty
         id: set_version
         run: |
@@ -57,18 +54,18 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x
           tags: |
-            ghcr.io/$REPO_OWNER/caddy-cloudflare-alpine:${{ env.VERSION }}
-            ghcr.io/$REPO_OWNER/caddy-cloudflare-alpine:latest
-            ghcr.io/$REPO_OWNER/caddy-cloudflare:${{ env.VERSION }}-alpine
-            ghcr.io/$REPO_OWNER/caddy-cloudflare:alpine
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare-alpine:${{ env.VERSION }}
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare-alpine:latest
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}-alpine
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare:alpine
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare-alpine:${{ env.VERSION }}
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare-alpine:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}-alpine
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:alpine
 
       - name: Clean up Docker images
         run: |
-          docker rmi ghcr.io/$REPO_OWNER/caddy-cloudflare-alpine:${{ env.VERSION }} || true
+          docker rmi ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare-alpine:${{ env.VERSION }} || true
           docker rmi ghcr.io/${REPO_OWNER/caddy-cloudflare:${{ env.VERSION }}-alpine || true
           docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare-alpine:${{ env.VERSION }} || true
           docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}-alpine || true

diff --git a/.github/workflows/build-docker-image-standard.yml b/.github/workflows/build-docker-image-standard.yml
@@ -36,9 +36,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Convert repository owner to lowercase
-        run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
-
       - name: Set version if empty
         id: set_version
         run: |
@@ -57,14 +54,14 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x
           tags: |
-            ghcr.io/$REPO_OWNER/caddy-cloudflare:${{ env.VERSION }}
-            ghcr.io/$REPO_OWNER/caddy-cloudflare:latest
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}
+            ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }}
             ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:latest
 
       - name: Clean up Docker images
         run: |
-          docker rmi ghcr.io/$REPO_OWNER/caddy-cloudflare:${{ env.VERSION }} || true
+          docker rmi ghcr.io/${{ secrets.DOCKER_USERNAME }}/caddy-cloudflare:${{ env.VERSION }} || true
           docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/caddy-cloudflare:${{ env.VERSION }} || true
           docker builder prune --force
 

diff --git a/version.json b/version.json