Skip to content

Commit

Permalink
fix docker build script
Browse files Browse the repository at this point in the history
  • Loading branch information
zhewang1-intc committed Apr 9, 2024
1 parent 65ae7c0 commit aaf0a67
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ COPY --from=cpu_avx2-build-amd64 /go/src/github.com/ollama/ollama/llm/build/linu
COPY --from=cuda-build-amd64 /go/src/github.com/ollama/ollama/llm/build/linux/ llm/build/linux/
COPY --from=rocm-build-amd64 /go/src/github.com/ollama/ollama/llm/build/linux/ llm/build/linux/
COPY --from=rocm-build-amd64 /go/src/github.com/ollama/ollama/dist/deps/ ./dist/deps/
COPY --from=oneapi-build-amd64 /go/src/github.com/ollama/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/
COPY --from=oneapi-build-amd64 /go/src/github.com/ollama/ollama/llm/build/linux/ llm/build/linux/
ARG GOFLAGS
ARG CGO_CFLAGS
RUN go build -trimpath .
Expand Down Expand Up @@ -143,7 +143,8 @@ ENTRYPOINT ["/bin/ollama"]
CMD ["serve"]

# oneAPI images are much larger so we keep it distinct from the CPU/CUDA image
FROM --platform=linux/amd64 intel/oneapi-runtime:2024.0.1-devel-rockylinux9 as runtime-oneapi
FROM --platform=linux/amd64 intel/oneapi-basekit:2024.0.1-devel-rockylinux9 as runtime-oneapi
RUN update-pciids
COPY --from=build-amd64 /go/src/github.com/ollama/ollama/ollama /bin/ollama
EXPOSE 11434
ENV OLLAMA_HOST 0.0.0.0
Expand Down
5 changes: 3 additions & 2 deletions scripts/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ if [ -z "${OLLAMA_SKIP_IMAGE_BUILD}" ]; then
.

docker build \
--load \
${LOAD_OR_PUSH} \
--platform=linux/amd64 \
--build-arg=VERSION \
--build-arg=GOFLAGS \
--target runtime-oneapi \
-f Dockerfile \
-t ${ARCH_IMAGE_REPO}:$VERSION-oneapi \
-t ${RELEASE_IMAGE_REPO}:$VERSION-oneapi \
.
fi
fi
Expand All @@ -85,5 +85,6 @@ if [ -z "${OLLAMA_SKIP_MANIFEST_CREATE}" ]; then
echo " ${RELEASE_IMAGE_REPO}:$VERSION-amd64"
echo " ${RELEASE_IMAGE_REPO}:$VERSION-arm64"
echo " ${RELEASE_IMAGE_REPO}:$VERSION-rocm"
echo " ${RELEASE_IMAGE_REPO}:$VERSION-oneapi"
fi
fi

0 comments on commit aaf0a67

Please sign in to comment.