From 397e2165a83d701d5c657a733708abb98254ae12 Mon Sep 17 00:00:00 2001 From: chenos Date: Fri, 29 Nov 2024 17:42:54 +0800 Subject: [PATCH] chore: update Dockerfile --- Dockerfile | 11 +++++++---- packages/core/cli/src/commands/start.js | 9 ++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index bbb01d364c..a94d3e8f45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,10 +49,13 @@ RUN cd /app \ FROM node:20.13-bullseye-slim -RUN apt-get update && apt-get install -y nginx libaio1 \ - && apt-get install -y --no-install-recommends postgresql-common gnupg \ - && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \ - && apt-get install -y --no-install-recommends postgresql-client-16 \ +RUN apt-get update && apt-get install -y --no-install-recommends wget gnupg \ + && rm -rf /var/lib/apt/lists/* + +RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list' +RUN wget --quiet -O - http://mirrors.ustc.edu.cn/postgresql/repos/apt/ACCC4CF8.asc | apt-key add - + +RUN apt-get update && apt-get -y --no-install-recommends install nginx libaio1 postgresql-client-16 postgresql-client-17 \ && rm -rf /var/lib/apt/lists/* RUN rm -rf /etc/nginx/sites-enabled/default diff --git a/packages/core/cli/src/commands/start.js b/packages/core/cli/src/commands/start.js index 39632310fd..f4e91a25f4 100644 --- a/packages/core/cli/src/commands/start.js +++ b/packages/core/cli/src/commands/start.js @@ -67,7 +67,14 @@ module.exports = (cli) => { const instances = opts.instances || process.env.CLUSTER_MODE; const instancesArgs = instances ? ['-i', instances] : []; if (opts.daemon) { - run('pm2', ['start', ...instancesArgs, `${APP_PACKAGE_ROOT}/lib/index.js`, '--', ...process.argv.slice(2)]); + await run('pm2', [ + 'start', + ...instancesArgs, + `${APP_PACKAGE_ROOT}/lib/index.js`, + '--', + ...process.argv.slice(2), + ]); + process.exit(); } else { run( 'pm2-runtime',