diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh index 0c795fb4..74a9ac84 100755 --- a/scripts/build_docker.sh +++ b/scripts/build_docker.sh @@ -5,13 +5,11 @@ set -eu export VERSION=${VERSION:-0.0.0} export GOFLAGS="'-ldflags=-w -s \"-X=github.com/jmorganca/ollama/version.Version=$VERSION\" \"-X=github.com/jmorganca/ollama/server.mode=release\"'" -docker buildx build \ +docker build \ --load \ --platform=linux/arm64,linux/amd64 \ --build-arg=VERSION \ --build-arg=GOFLAGS \ - --cache-from type=local,src=.cache \ - --cache-to type=local,dest=.cache \ -f Dockerfile \ -t ollama/ollama:$VERSION \ . diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh index 602fd755..fb8766f9 100755 --- a/scripts/build_linux.sh +++ b/scripts/build_linux.sh @@ -8,7 +8,7 @@ export GOFLAGS="'-ldflags=-w -s \"-X=github.com/jmorganca/ollama/version.Version mkdir -p dist for TARGETARCH in amd64 arm64; do - docker buildx build --load --platform=linux/$TARGETARCH --build-arg=VERSION --build-arg=GOFLAGS --build-arg=CGO_CFLAGS --cache-from type=local,src=.cache --cache-to type=local,dest=.cache -f Dockerfile.build -t builder:$TARGETARCH . + docker build --platform=linux/$TARGETARCH --build-arg=VERSION --build-arg=GOFLAGS --build-arg=CGO_CFLAGS -f Dockerfile.build -t builder:$TARGETARCH . docker create --platform linux/$TARGETARCH --name builder-$TARGETARCH builder:$TARGETARCH docker cp builder-$TARGETARCH:/go/src/github.com/jmorganca/ollama/ollama ./dist/ollama-linux-$TARGETARCH docker rm builder-$TARGETARCH diff --git a/scripts/push_docker.sh b/scripts/push_docker.sh index 31865c2b..da953dd4 100755 --- a/scripts/push_docker.sh +++ b/scripts/push_docker.sh @@ -5,12 +5,11 @@ set -eu export VERSION=${VERSION:-0.0.0} export GOFLAGS="'-ldflags=-w -s \"-X=github.com/jmorganca/ollama/version.Version=$VERSION\" \"-X=github.com/jmorganca/ollama/server.mode=release\"'" -docker buildx build \ +docker build \ --push \ --platform=linux/arm64,linux/amd64 \ --build-arg=VERSION \ --build-arg=GOFLAGS \ - --cache-from type=local,src=.cache \ -f Dockerfile \ -t ollama/ollama -t ollama/ollama:$VERSION \ .