jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: fix linux version (#8054)

Browse Source 
Pass through the version override so the makefiles use it
This commit is contained in:
Daniel Hiltgen 2024-12-11 14:09:57 -08:00 committed by GitHub
parent 9039c821a2
commit 36d111e788
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -66,6 +66,7 @@ COPY . .
ARG OLLAMA_SKIP_CUDA_GENERATE ARG OLLAMA_SKIP_CUDA_GENERATE
ARG OLLAMA_SKIP_ROCM_GENERATE ARG OLLAMA_SKIP_ROCM_GENERATE
ARG OLLAMA_FAST_BUILD ARG OLLAMA_FAST_BUILD
ARG VERSION
RUN --mount=type=cache,target=/root/.ccache \ RUN --mount=type=cache,target=/root/.ccache \
if grep "^flags" /proc/cpuinfo|grep avx>/dev/null; then \ if grep "^flags" /proc/cpuinfo|grep avx>/dev/null; then \
make -j $(expr $(nproc) / 2 ) dist ; \ make -j $(expr $(nproc) / 2 ) dist ; \
@ -91,6 +92,7 @@ WORKDIR /go/src/github.com/ollama/ollama/
COPY . . COPY . .
ARG CGO_CFLAGS ARG CGO_CFLAGS
ENV GOARCH arm64 ENV GOARCH arm64
ARG VERSION
RUN --mount=type=cache,target=/root/.ccache \ RUN --mount=type=cache,target=/root/.ccache \
make -j 5 dist_cuda_v11 \ make -j 5 dist_cuda_v11 \
CUDA_ARCHITECTURES="72;87" \ CUDA_ARCHITECTURES="72;87" \
@ -109,6 +111,7 @@ WORKDIR /go/src/github.com/ollama/ollama/
COPY . . COPY . .
ARG CGO_CFLAGS ARG CGO_CFLAGS
ENV GOARCH arm64 ENV GOARCH arm64
ARG VERSION
RUN --mount=type=cache,target=/root/.ccache \ RUN --mount=type=cache,target=/root/.ccache \
make -j 5 dist_cuda_v12 \ make -j 5 dist_cuda_v12 \
CUDA_ARCHITECTURES="87" \ CUDA_ARCHITECTURES="87" \
@ -120,6 +123,7 @@ FROM --platform=linux/arm64 unified-builder-arm64 AS build-arm64
COPY . . COPY . .
ARG OLLAMA_SKIP_CUDA_GENERATE ARG OLLAMA_SKIP_CUDA_GENERATE
ARG OLLAMA_FAST_BUILD ARG OLLAMA_FAST_BUILD
ARG VERSION
RUN --mount=type=cache,target=/root/.ccache \ RUN --mount=type=cache,target=/root/.ccache \
make -j 5 dist make -j 5 dist
COPY --from=runners-jetpack5-arm64 /go/src/github.com/ollama/ollama/dist/ dist/ COPY --from=runners-jetpack5-arm64 /go/src/github.com/ollama/ollama/dist/ dist/