Przeglądaj źródła

update cuda docker image

Michael Yang 1 rok temu
rodzic
commit
9aa192c812
2 zmienionych plików z 11 dodań i 3 usunięć
  1. 4 1
      Dockerfile
  2. 7 2
      Dockerfile.cuda

+ 4 - 1
Dockerfile

@@ -1,10 +1,13 @@
 FROM golang:alpine
 FROM golang:alpine
 
 
+ARG VERSION=0.0.0
+
 WORKDIR /go/src/github.com/jmorganca/ollama
 WORKDIR /go/src/github.com/jmorganca/ollama
 RUN apk add --no-cache git build-base cmake
 RUN apk add --no-cache git build-base cmake
 
 
 COPY . .
 COPY . .
-RUN go generate ./... && go build -ldflags '-linkmode external -extldflags "-static"' .
+RUN go generate ./... \
+    && go build -ldflags "-linkmode=external -extldflags='-static' -X=github.com/jmorganca/ollama/version.Version=$VERSION -X=github.com/jmorganca/ollama/server.mode=release" .
 
 
 FROM alpine
 FROM alpine
 ENV OLLAMA_HOST 0.0.0.0
 ENV OLLAMA_HOST 0.0.0.0

+ 7 - 2
Dockerfile.cuda

@@ -1,12 +1,17 @@
 FROM nvidia/cuda:12.2.0-devel-ubuntu22.04
 FROM nvidia/cuda:12.2.0-devel-ubuntu22.04
 
 
+ARG TARGETARCH
+ARG VERSION=0.0.0
+
 WORKDIR /go/src/github.com/jmorganca/ollama
 WORKDIR /go/src/github.com/jmorganca/ollama
 RUN apt-get update && apt-get install -y git build-essential cmake
 RUN apt-get update && apt-get install -y git build-essential cmake
-ADD https://dl.google.com/go/go1.21.1.linux-amd64.tar.gz /tmp/go1.21.1.tar.gz
+ADD https://dl.google.com/go/go1.21.1.linux-$TARGETARCH.tar.gz /tmp/go1.21.1.tar.gz
 RUN mkdir -p /usr/local && tar xz -C /usr/local </tmp/go1.21.1.tar.gz
 RUN mkdir -p /usr/local && tar xz -C /usr/local </tmp/go1.21.1.tar.gz
 
 
 COPY . .
 COPY . .
-RUN /usr/local/go/bin/go generate ./... && /usr/local/go/bin/go build -ldflags '-linkmode external -extldflags "-static"' .
+ENV GOARCH=$TARGETARCH
+RUN /usr/local/go/bin/go generate ./... \
+    && /usr/local/go/bin/go build -ldflags "-linkmode=external -extldflags='-static' -X=github.com/jmorganca/ollama/version.Version=$VERSION -X=github.com/jmorganca/ollama/server.mode=release" .
 
 
 FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04
 FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04
 ENV OLLAMA_HOST 0.0.0.0
 ENV OLLAMA_HOST 0.0.0.0