Skip to content

GitLab

Unverified Commit 36d111e7 authored by Daniel Hiltgen's avatar Daniel Hiltgen Committed by GitHub
Browse files

ci: fix linux version (#8054) 

Pass through the version override so the makefiles use it
parent 9039c821
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
Dockerfile
View file @ 36d111e7
...@@ -66,6 +66,7 @@ COPY . . ...@@ -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/ ...@@ -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/ ...@@ -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 ...@@ -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/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment