diff --git a/.gitea/actions/buildkit-build-push-dev/action.yaml b/.gitea/actions/buildkit-build-push-dev/action.yaml index 302e5ba..630bf7a 100644 --- a/.gitea/actions/buildkit-build-push-dev/action.yaml +++ b/.gitea/actions/buildkit-build-push-dev/action.yaml @@ -40,11 +40,19 @@ runs: run: | AUTH_INLINE=$(printf "%s:%s" "${{ inputs.registry_username }}" "${{ inputs.registry_password }}" | base64 -w0) - AUTH_JSON=$(jq -n \ - --arg reg "${{ inputs.registry_addr }}" \ - --arg auth "$AUTH_INLINE" \ - '{auths: {($reg): {auth: $auth}}}') - + read -r -d '' AUTH_JSON <<'EOF' + { + "auths": { + "__REGISTRY__": { + "auth": "__AUTH__" + } + } + } + EOF + + AUTH_JSON="${AUTH_JSON/__REGISTRY__/${{ inputs.registry_addr }}}" + AUTH_JSON="${AUTH_JSON/__AUTH__/$AUTH_INLINE}" + buildctl \ --addr ${{ inputs.buildkit_addr }} \ build \ diff --git a/.gitea/workflows/ssh-client-build-deploy.yaml b/.gitea/workflows/ssh-client-build-deploy.yaml index baaf8f6..521e25b 100644 --- a/.gitea/workflows/ssh-client-build-deploy.yaml +++ b/.gitea/workflows/ssh-client-build-deploy.yaml @@ -22,7 +22,6 @@ jobs: RUNNER_TEMP: "${{ runner.temp }}" WORKSPACE: "${{ gitea.workspace }}" - run: | curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1