@@ -225,7 +225,7 @@ jobs:
225225 CGO_CFLAGS=${{ env.CGO_CFLAGS }}
226226 CGO_CXXFLAGS=${{ env.CGO_CXXFLAGS }}
227227 outputs : type=local,dest=dist/${{ matrix.os }}-${{ matrix.arch }}
228- cache-from : type=registry,ref=ollama/ollama :latest
228+ cache-from : type=registry,ref=${{ vars.DOCKER_REPO }} :latest
229229 cache-to : type=inline
230230 - run : |
231231 for COMPONENT in bin/* lib/ollama/*; do
@@ -298,8 +298,8 @@ jobs:
298298 context : .
299299 platforms : ${{ matrix.os }}/${{ matrix.arch }}
300300 build-args : ${{ matrix.build-args }}
301- outputs : type=image,name=ollama/ollama ,push-by-digest=true,name-canonical=true,push=true
302- cache-from : type=registry,ref=ollama/ollama :latest
301+ outputs : type=image,name=${{ vars.DOCKER_REPO }} ,push-by-digest=true,name-canonical=true,push=true
302+ cache-from : type=registry,ref=${{ vars.DOCKER_REPO }} :latest
303303 cache-to : type=inline
304304 - run : |
305305 mkdir -p ${{ matrix.os }}-${{ matrix.arch }}
@@ -331,7 +331,7 @@ jobs:
331331 latest=false
332332 suffix=${{ matrix.suffix }}
333333 images : |
334- ollama/ollama
334+ ${{ vars.DOCKER_REPO }}
335335 tags : |
336336 type=ref,enable=true,priority=600,prefix=pr-,event=pr
337337 type=semver,pattern={{version}}
@@ -341,8 +341,8 @@ jobs:
341341 path : ${{ runner.temp }}
342342 merge-multiple : true
343343 - run : |
344- docker buildx imagetools create $(echo '${{ steps.metadata.outputs.json }}' | jq -cr '.tags | map("-t", .) | join(" ")') $(cat *-${{ matrix.suffix }}.txt | xargs printf 'ollama/ollama @%s ')
345- docker buildx imagetools inspect ollama/ollama :${{ steps.metadata.outputs.version }}
344+ docker buildx imagetools create $(echo '${{ steps.metadata.outputs.json }}' | jq -cr '.tags | map("-t", .) | join(" ")') $(cat *-${{ matrix.suffix }}.txt | xargs printf '${{ vars.DOCKER_REPO }} @%s ')
345+ docker buildx imagetools inspect ${{ vars.DOCKER_REPO }} :${{ steps.metadata.outputs.version }}
346346 working-directory: ${{ runner.temp }}
347347
348348 # Trigger downstream release process
@@ -380,4 +380,4 @@ jobs:
380380 -H "Authorization: Bearer ${{ secrets.RELEASE_TOKEN }}" \
381381 -H "X-GitHub-Api-Version: 2022-11-28" \
382382 https://api.github.com/repos/ollama/${{ vars.RELEASE_REPO }}/dispatches \
383- -d "{\"event_type\": \"trigger-workflow\", \"client_payload\": {\"run_id\": \"${GITHUB_RUN_ID}\", \"version\": \"${GITHUB_REF_NAME#v}\", \"publish\": \"1\"}}"
383+ -d "{\"event_type\": \"trigger-workflow\", \"client_payload\": {\"run_id\": \"${GITHUB_RUN_ID}\", \"version\": \"${GITHUB_REF_NAME#v}\", \"origin\": \"${GITHUB_REPOSITORY}\", \" publish\": \"1\"}}"
0 commit comments