From b5fcd9d3aa6b05fe09f0a604bde9314d5d8d27ea Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 11 Mar 2024 15:58:46 -0700 Subject: [PATCH] use `-trimpath` when building releases (#3069) --- Dockerfile | 4 ++-- scripts/build_darwin.sh | 4 ++-- scripts/build_windows.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20de81c9..0cbc7e34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -92,7 +92,7 @@ COPY --from=rocm-build-amd64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/b COPY --from=rocm-build-amd64 /go/src/github.com/jmorganca/ollama/dist/deps/ ./dist/deps/ ARG GOFLAGS ARG CGO_CFLAGS -RUN go build . +RUN go build -trimpath . # Intermediate stage used for ./scripts/build_linux.sh FROM --platform=linux/arm64 cpu-build-arm64 AS build-arm64 @@ -103,7 +103,7 @@ COPY . . COPY --from=cuda-build-arm64 /go/src/github.com/jmorganca/ollama/llm/llama.cpp/build/linux/ llm/llama.cpp/build/linux/ ARG GOFLAGS ARG CGO_CFLAGS -RUN go build . +RUN go build -trimpath . # Runtime stages FROM --platform=linux/amd64 ubuntu:22.04 as runtime-amd64 diff --git a/scripts/build_darwin.sh b/scripts/build_darwin.sh index 2daf4c8d..cb561123 100755 --- a/scripts/build_darwin.sh +++ b/scripts/build_darwin.sh @@ -10,8 +10,8 @@ mkdir -p dist for TARGETARCH in arm64 amd64; do rm -rf llm/llama.cpp/build GOOS=darwin GOARCH=$TARGETARCH go generate ./... - CGO_ENABLED=1 GOOS=darwin GOARCH=$TARGETARCH go build -o dist/ollama-darwin-$TARGETARCH - CGO_ENABLED=1 GOOS=darwin GOARCH=$TARGETARCH go build -cover -o dist/ollama-darwin-$TARGETARCH-cov + CGO_ENABLED=1 GOOS=darwin GOARCH=$TARGETARCH go build -trimpath -o dist/ollama-darwin-$TARGETARCH + CGO_ENABLED=1 GOOS=darwin GOARCH=$TARGETARCH go build -trimpath -cover -o dist/ollama-darwin-$TARGETARCH-cov done lipo -create -output dist/ollama dist/ollama-darwin-arm64 dist/ollama-darwin-amd64 diff --git a/scripts/build_windows.ps1 b/scripts/build_windows.ps1 index ac8e10a2..ee184799 100644 --- a/scripts/build_windows.ps1 +++ b/scripts/build_windows.ps1 @@ -53,7 +53,7 @@ function buildOllama() { write-host "Building ollama CLI" & go generate ./... if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} - & go build -ldflags "-s -w -X=github.com/jmorganca/ollama/version.Version=$script:VERSION -X=github.com/jmorganca/ollama/server.mode=release" . + & go build -trimpath -ldflags "-s -w -X=github.com/jmorganca/ollama/version.Version=$script:VERSION -X=github.com/jmorganca/ollama/server.mode=release" . if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ("${env:KEY_CONTAINER}") { & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" ` @@ -68,7 +68,7 @@ function buildApp() { write-host "Building Ollama App" cd "${script:SRC_DIR}\app" & windres -l 0 -o ollama.syso ollama.rc - & go build -ldflags "-s -w -H windowsgui -X=github.com/jmorganca/ollama/version.Version=$script:VERSION -X=github.com/jmorganca/ollama/server.mode=release" . + & go build -trimpath -ldflags "-s -w -H windowsgui -X=github.com/jmorganca/ollama/version.Version=$script:VERSION -X=github.com/jmorganca/ollama/server.mode=release" . if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ("${env:KEY_CONTAINER}") { & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `