Skip to content

Commit a54147f

Browse files
committed
Hack: download go from aliyun/use goproxy.cn/only build musa image (#3)
Signed-off-by: Xiaodong Ye <[email protected]>
1 parent b150cb3 commit a54147f

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ RUN --mount=type=cache,target=/root/.ccache \
8181
FROM base AS build
8282
WORKDIR /go/src/github.com/ollama/ollama
8383
COPY go.mod go.sum .
84-
RUN curl -fsSL https://golang.org/dl/go$(awk '/^go/ { print $2 }' go.mod).linux-$(case $(uname -m) in x86_64) echo amd64 ;; aarch64) echo arm64 ;; esac).tar.gz | tar xz -C /usr/local
84+
RUN curl -fsSL https://mirrors.aliyun.com/golang/go$(awk '/^go/ { print $2 }' go.mod).linux-$(case $(uname -m) in x86_64) echo amd64 ;; aarch64) echo arm64 ;; esac).tar.gz | tar xz -C /usr/local
8585
ENV PATH=/usr/local/go/bin:$PATH
86+
ENV GOPROXY=https://goproxy.cn,direct
8687
RUN go mod download
8788
COPY . .
8889
ARG GOFLAGS="'-ldflags=-w -s'"

scripts/build_docker.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@ else
1515
LOAD_OR_PUSH="--push"
1616
fi
1717

18-
docker buildx build \
19-
${LOAD_OR_PUSH} \
20-
--platform=${PLATFORM} \
21-
${OLLAMA_COMMON_BUILD_ARGS} \
22-
-f Dockerfile \
23-
-t ${FINAL_IMAGE_REPO}:$VERSION \
24-
.
18+
FLAVORS="musa"
19+
if [ "${DOCKER_ORG}" != "mthreads" ]; then
20+
docker buildx build \
21+
${LOAD_OR_PUSH} \
22+
--platform=${PLATFORM} \
23+
${OLLAMA_COMMON_BUILD_ARGS} \
24+
-f Dockerfile \
25+
-t ${FINAL_IMAGE_REPO}:$VERSION \
26+
.
27+
FLAVORS="rocm musa"
28+
fi
29+
2530

2631
if echo $PLATFORM | grep "amd64" > /dev/null; then
27-
for FLAVOR in "rocm" "musa"; do
32+
for FLAVOR in $FLAVORS; do
2833
docker buildx build \
2934
${LOAD_OR_PUSH} \
3035
--platform=linux/amd64 \

0 commit comments

Comments
 (0)