diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index a57a7f6..c2f8eb0 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -32,10 +32,11 @@ jobs: if [ -z "$REG_HOST_RAW" ]; then echo "Missing GITEA_SERVER_URL/GITHUB_SERVER_URL"; exit 1; fi REG_HOST="${REG_HOST_RAW#http://}"; REG_HOST="${REG_HOST#https://}"; REG_HOST="${REG_HOST%%/*}" # Override if needed (set secret/env to git.thumeit.com[:port]) - OVERRIDE="${{ secrets.GITEA_REGISTRY_HOST }}"; [ -z "$OVERRIDE" ] && OVERRIDE="${GITEA_REGISTRY_HOST}" - [ -z "$OVERRIDE" ] && OVERRIDE="${{ secrets.REGISTRY_HOST }}" - [ -z "$OVERRIDE" ] && OVERRIDE="${REGISTRY_HOST}" - if [ "$REG_HOST" = "gitea" ] && [ -n "$OVERRIDE" ]; then REG_HOST="$OVERRIDE"; fi + OVERRIDE="${{ secrets.GITEA_REGISTRY_HOST }}" + [ -z "${OVERRIDE:-}" ] && OVERRIDE="${GITEA_REGISTRY_HOST:-}" + [ -z "${OVERRIDE:-}" ] && OVERRIDE="${{ secrets.REGISTRY_HOST }}" + [ -z "${OVERRIDE:-}" ] && OVERRIDE="${REGISTRY_HOST:-}" + if [ "$REG_HOST" = "gitea" ] && [ -n "${OVERRIDE:-}" ]; then REG_HOST="$OVERRIDE"; fi echo "owner=$OWNER" >> $GITHUB_OUTPUT echo "repo=$REPO" >> $GITHUB_OUTPUT echo "host=$REG_HOST" >> $GITHUB_OUTPUT