From 3eea8759321bd7ca232da5002cd1ad474a1a203d Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 13 Dec 2025 12:30:30 +0800 Subject: [PATCH 1/4] code clear --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae8c997f8..1092081df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,11 @@ FROM node:20.16.0-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable -RUN corepack prepare pnpm@9.12.0 --activate +RUN corepack enable && corepack prepare pnpm@9.12.0 --activate FROM base AS build -COPY . /usr/src/app WORKDIR /usr/src/app +COPY . /usr/src/app RUN apt-get update && apt-get install -y python3 make g++ git python3-pip pkg-config libsecret-1-dev && rm -rf /var/lib/apt/lists/* @@ -65,4 +64,4 @@ RUN curl -sSL https://railpack.com/install.sh | bash COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack EXPOSE 3000 -CMD [ "pnpm", "start" ] +CMD ["pnpm", "start"] From c33b41d082bea620391d4b61e362ecfa835c0899 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 13 Dec 2025 12:32:01 +0800 Subject: [PATCH 2/4] fix(docker): use ENV for HOSTNAME and exec form CMD --- Dockerfile.schedule | 6 +++--- Dockerfile.server | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.schedule b/Dockerfile.schedule index ecb125e09..54bf74e96 100644 --- a/Dockerfile.schedule +++ b/Dockerfile.schedule @@ -2,8 +2,7 @@ FROM node:20.16.0-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable -RUN corepack prepare pnpm@9.12.0 --activate +RUN corepack enable && corepack prepare pnpm@9.12.0 --activate FROM base AS build COPY . /usr/src/app @@ -35,4 +34,5 @@ COPY --from=build /prod/schedules/dist ./dist COPY --from=build /prod/schedules/package.json ./package.json COPY --from=build /prod/schedules/node_modules ./node_modules -CMD HOSTNAME=0.0.0.0 && pnpm start \ No newline at end of file +ENV HOSTNAME=0.0.0.0 +CMD ["pnpm", "start"] \ No newline at end of file diff --git a/Dockerfile.server b/Dockerfile.server index ea6b372e8..baa7a33b9 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -2,8 +2,7 @@ FROM node:20.16.0-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable -RUN corepack prepare pnpm@9.12.0 --activate +RUN corepack enable && corepack prepare pnpm@9.12.0 --activate FROM base AS build COPY . /usr/src/app @@ -35,4 +34,5 @@ COPY --from=build /prod/api/dist ./dist COPY --from=build /prod/api/package.json ./package.json COPY --from=build /prod/api/node_modules ./node_modules -CMD HOSTNAME=0.0.0.0 && pnpm start \ No newline at end of file +ENV HOSTNAME=0.0.0.0 +CMD ["pnpm", "start"] \ No newline at end of file From d8465ac251089ae6a9ab388d0491c498bf593d00 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 13 Dec 2025 12:36:15 +0800 Subject: [PATCH 3/4] config: set port env --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 1092081df..fc1d02621 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 FROM node:20.16.0-slim AS base +ENV PORT=3000 ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable && corepack prepare pnpm@9.12.0 --activate From 3142818cf26f325f5f9aa62ff44bfccc0e7149aa Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 13 Dec 2025 15:33:24 +0800 Subject: [PATCH 4/4] fix(docker): use ENV for HOSTNAME and exec form CMD --- Dockerfile | 8 ++++---- Dockerfile.schedule | 3 ++- Dockerfile.server | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc1d02621..ae8c997f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # syntax=docker/dockerfile:1 FROM node:20.16.0-slim AS base -ENV PORT=3000 ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable && corepack prepare pnpm@9.12.0 --activate +RUN corepack enable +RUN corepack prepare pnpm@9.12.0 --activate FROM base AS build -WORKDIR /usr/src/app COPY . /usr/src/app +WORKDIR /usr/src/app RUN apt-get update && apt-get install -y python3 make g++ git python3-pip pkg-config libsecret-1-dev && rm -rf /var/lib/apt/lists/* @@ -65,4 +65,4 @@ RUN curl -sSL https://railpack.com/install.sh | bash COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack EXPOSE 3000 -CMD ["pnpm", "start"] +CMD [ "pnpm", "start" ] diff --git a/Dockerfile.schedule b/Dockerfile.schedule index 54bf74e96..cbdaa48cf 100644 --- a/Dockerfile.schedule +++ b/Dockerfile.schedule @@ -2,7 +2,8 @@ FROM node:20.16.0-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable && corepack prepare pnpm@9.12.0 --activate +RUN corepack enable +RUN corepack prepare pnpm@9.12.0 --activate FROM base AS build COPY . /usr/src/app diff --git a/Dockerfile.server b/Dockerfile.server index baa7a33b9..268831e10 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -2,7 +2,8 @@ FROM node:20.16.0-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN corepack enable && corepack prepare pnpm@9.12.0 --activate +RUN corepack enable +RUN corepack prepare pnpm@9.12.0 --activate FROM base AS build COPY . /usr/src/app @@ -34,5 +35,5 @@ COPY --from=build /prod/api/dist ./dist COPY --from=build /prod/api/package.json ./package.json COPY --from=build /prod/api/node_modules ./node_modules -ENV HOSTNAME=0.0.0.0 +ENV HOSTNAME=0.0.0.0 CMD ["pnpm", "start"] \ No newline at end of file