Skip to content

Commit 12f2992

Browse files
committed
build(docker): 统一Dockerfile内缩进风格并新增nodejs和npm依赖
调整了Dockerfile中所有命令的缩进格式保持一致,同时在运行时依赖中添加nodejs和npm包
1 parent 971b1af commit 12f2992

1 file changed

Lines changed: 35 additions & 33 deletions

File tree

Dockerfile

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,36 @@ RUN go mod download
2424
COPY . .
2525

2626
RUN apt-get update && apt-get install -y --no-install-recommends gcc libc6-dev \
27-
&& rm -rf /var/lib/apt/lists/*
27+
&& rm -rf /var/lib/apt/lists/*
2828

2929
RUN CGO_ENABLED=1 go build \
30-
-trimpath \
31-
-ldflags="-s -w \
32-
-X github.com/DotNetAge/mindx/internal/core.Version=${VERSION#v} \
33-
-X github.com/DotNetAge/mindx/internal/core.Commit=${COMMIT} \
34-
-X github.com/DotNetAge/mindx/internal/core.BuildTime=${BUILD_TIME}" \
35-
-o /usr/local/bin/mindx \
36-
.
30+
-trimpath \
31+
-ldflags="-s -w \
32+
-X github.com/DotNetAge/mindx/internal/core.Version=${VERSION#v} \
33+
-X github.com/DotNetAge/mindx/internal/core.Commit=${COMMIT} \
34+
-X github.com/DotNetAge/mindx/internal/core.BuildTime=${BUILD_TIME}" \
35+
-o /usr/local/bin/mindx \
36+
.
3737

3838
# ---- ONNX Runtime download stage ----
3939
FROM debian:bookworm-slim AS onnxruntime-dl
4040

4141
ARG TARGETARCH
4242
RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates \
43-
&& rm -rf /var/lib/apt/lists/*
43+
&& rm -rf /var/lib/apt/lists/*
4444

4545
RUN set -ex; \
46-
ONNX_VERSION="1.24.4"; \
47-
if [ "$TARGETARCH" = "arm64" ]; then \
48-
ARCH="aarch64"; \
49-
else \
50-
ARCH="x64"; \
51-
fi; \
52-
curl -fL -o /tmp/onnxruntime.tgz \
53-
"https://github.com/microsoft/onnxruntime/releases/download/v${ONNX_VERSION}/onnxruntime-linux-${ARCH}-${ONNX_VERSION}.tgz"; \
54-
tar xzf /tmp/onnxruntime.tgz -C /tmp; \
55-
cp -P "/tmp/onnxruntime-linux-${ARCH}-${ONNX_VERSION}/lib/libonnxruntime.so"* /usr/local/lib/; \
56-
rm -rf /tmp/onnxruntime*
46+
ONNX_VERSION="1.24.4"; \
47+
if [ "$TARGETARCH" = "arm64" ]; then \
48+
ARCH="aarch64"; \
49+
else \
50+
ARCH="x64"; \
51+
fi; \
52+
curl -fL -o /tmp/onnxruntime.tgz \
53+
"https://github.com/microsoft/onnxruntime/releases/download/v${ONNX_VERSION}/onnxruntime-linux-${ARCH}-${ONNX_VERSION}.tgz"; \
54+
tar xzf /tmp/onnxruntime.tgz -C /tmp; \
55+
cp -P "/tmp/onnxruntime-linux-${ARCH}-${ONNX_VERSION}/lib/libonnxruntime.so"* /usr/local/lib/; \
56+
rm -rf /tmp/onnxruntime*
5757

5858
# ---- Runtime stage ----
5959
FROM debian:bookworm-slim
@@ -67,13 +67,15 @@ ENV MINDX_VERSION=${VERSION}
6767

6868
# Install runtime dependencies (minimal set)
6969
RUN apt-get update && apt-get install -y --no-install-recommends \
70-
ca-certificates \
71-
python3 \
72-
python3-pip \
73-
bash \
74-
wget \
75-
tini \
76-
&& rm -rf /var/lib/apt/lists/*
70+
ca-certificates \
71+
python3 \
72+
python3-pip \
73+
nodejs \
74+
npm \
75+
bash \
76+
wget \
77+
tini \
78+
&& rm -rf /var/lib/apt/lists/*
7779

7880
# Copy ONNX Runtime shared library
7981
COPY --from=onnxruntime-dl /usr/local/lib/libonnxruntime.so* /usr/local/lib/
@@ -84,10 +86,10 @@ COPY --from=builder /usr/local/bin/mindx /usr/local/bin/mindx
8486

8587
# Non-root user + runtime directories
8688
RUN adduser --disabled-password --gecos '' mindx && \
87-
mkdir -p /home/mindx/.mindx/logs \
88-
/home/mindx/.mindx/sessions \
89-
/home/mindx/workspaces && \
90-
chown -R mindx:mindx /home/mindx/.mindx /home/mindx/workspaces
89+
mkdir -p /home/mindx/.mindx/logs \
90+
/home/mindx/.mindx/sessions \
91+
/home/mindx/workspaces && \
92+
chown -R mindx:mindx /home/mindx/.mindx /home/mindx/workspaces
9193

9294
USER mindx
9395
WORKDIR /home/mindx
@@ -97,7 +99,7 @@ COPY --chown=mindx:mindx runtime/ /home/mindx/.mindx/
9799

98100
# Fix venv path in mindx.json for container
99101
RUN sed -i 's|/Users/ray/.mindx/.venv|/home/mindx/.mindx/.venv|g' \
100-
/home/mindx/.mindx/mindx.json 2>/dev/null || true
102+
/home/mindx/.mindx/mindx.json 2>/dev/null || true
101103

102104
# Ports
103105
# 1313: Web UI (HTTP)
@@ -106,7 +108,7 @@ EXPOSE 1313 1314
106108

107109
# Health check
108110
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
109-
CMD wget -qO- http://localhost:1313/ || exit 1
111+
CMD wget -qO- http://localhost:1313/ || exit 1
110112

111113
ENTRYPOINT ["/usr/bin/tini", "--", "mindx"]
112114
CMD ["daemon"]

0 commit comments

Comments
 (0)