diff --git a/.gitea/actions/buildkit-build-push-dev/action.yaml b/.gitea/actions/buildkit-build-push-dev/action.yaml index e7042c2..302e5ba 100644 --- a/.gitea/actions/buildkit-build-push-dev/action.yaml +++ b/.gitea/actions/buildkit-build-push-dev/action.yaml @@ -38,10 +38,13 @@ runs: - name: run buildctl build and push shell: bash run: | - AUTH_JSON=$(printf '{"auths":{"%s":{"auth":"%s"}}}' \ - "${{ inputs.registry_addr }}" \ - "$(printf "%s:%s" "${{ inputs.registry_username }}" "${{ inputs.registry_password }}" | base64 -w0)") + 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}}}') + buildctl \ --addr ${{ inputs.buildkit_addr }} \ build \ @@ -50,4 +53,4 @@ runs: --local dockerfile=${{ inputs.dockerfile }} \ --opt filename=${{ inputs.filename }} \ $BUILD_ARG_FLAGS \ - --output type=image,name=${{ inputs.tags }},push=true,registry.config=$AUTH_JSON + --output type=image,name=${{ inputs.tags }},push=true,registry.config="$AUTH_JSON" diff --git a/.gitea/workflows/ssh-client-build-deploy.yaml b/.gitea/workflows/ssh-client-build-deploy.yaml index 521e25b..baaf8f6 100644 --- a/.gitea/workflows/ssh-client-build-deploy.yaml +++ b/.gitea/workflows/ssh-client-build-deploy.yaml @@ -22,6 +22,7 @@ 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