From 166e3ef02cdee6e5507865b5c09fc65087c84be2 Mon Sep 17 00:00:00 2001 From: HRiggs Date: Sat, 6 Jun 2026 01:51:12 -0400 Subject: [PATCH] more fixes --- .gitea/workflows/docker-publish.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/docker-publish.yml b/.gitea/workflows/docker-publish.yml index d084c27..0577fce 100644 --- a/.gitea/workflows/docker-publish.yml +++ b/.gitea/workflows/docker-publish.yml @@ -35,6 +35,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Normalize image coordinates + id: image + shell: bash + run: | + REGISTRY_LOWER="$(echo "${REGISTRY}" | tr '[:upper:]' '[:lower:]')" + NAMESPACE_LOWER="$(echo "${IMAGE_NAMESPACE}" | tr '[:upper:]' '[:lower:]')" + IMAGE_REF="${REGISTRY_LOWER}/${NAMESPACE_LOWER}/${{ matrix.image }}" + + echo "registry=${REGISTRY_LOWER}" >> "$GITHUB_OUTPUT" + echo "namespace=${NAMESPACE_LOWER}" >> "$GITHUB_OUTPUT" + echo "image_ref=${IMAGE_REF}" >> "$GITHUB_OUTPUT" + - name: Validate registry settings shell: bash run: | @@ -49,15 +61,15 @@ jobs: - name: Login to registry uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY }} - username: HRiggs + registry: ${{ steps.image.outputs.registry }} + username: ${{ env.REGISTRY_USERNAME }} password: ${{ env.REGISTRY_PASSWORD }} - name: Docker meta id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ matrix.image }} + images: ${{ steps.image.outputs.image_ref }} tags: | type=sha type=ref,event=branch @@ -74,5 +86,5 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ matrix.image }}:buildcache - cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ matrix.image }}:buildcache,mode=max + cache-from: type=registry,ref=${{ steps.image.outputs.image_ref }}:buildcache + cache-to: type=registry,ref=${{ steps.image.outputs.image_ref }}:buildcache,mode=max