From 1567b929fdb7376a55e7df602c753ad6dfc0a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Tue, 26 Sep 2023 09:48:05 +0000 Subject: [PATCH] docker enterprise --- deploy/enterprise/Dockerfile | 11 ++++------- .../{ => fs/opt/steedos/platform}/package.json | 0 .../{ => fs/opt/steedos/platform}/steedos.config.js | 0 .../fs/opt/steedos/templates/supervisord/steedos.conf | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) rename deploy/enterprise/{ => fs/opt/steedos/platform}/package.json (100%) rename deploy/enterprise/{ => fs/opt/steedos/platform}/steedos.config.js (100%) diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile index 02276a6013..c706cca1a1 100644 --- a/deploy/enterprise/Dockerfile +++ b/deploy/enterprise/Dockerfile @@ -5,8 +5,6 @@ RUN apt-get update || : && apt-get install -y \ curl \ build-essential -WORKDIR /app - # Install MongoDB 4.4 # https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-debian/ RUN apt-get update \ @@ -32,9 +30,10 @@ RUN apt-get update \ && apt-get remove -y git python-pip \ && apt-get clean -y +COPY ./fs/ / + -COPY package.json . -COPY steedos.config.js . +WORKDIR /opt/steedos/platform ENV NODE_ENV=production @@ -62,9 +61,7 @@ ENV TMP /tmp/steedos # Define volumes - Service Layer VOLUME [ "/steedos-stacks" ] -WORKDIR /app - -COPY ./fs/ / +WORKDIR /opt/steedos/platform ENTRYPOINT [ "/opt/steedos/entrypoint.sh" ] diff --git a/deploy/enterprise/package.json b/deploy/enterprise/fs/opt/steedos/platform/package.json similarity index 100% rename from deploy/enterprise/package.json rename to deploy/enterprise/fs/opt/steedos/platform/package.json diff --git a/deploy/enterprise/steedos.config.js b/deploy/enterprise/fs/opt/steedos/platform/steedos.config.js similarity index 100% rename from deploy/enterprise/steedos.config.js rename to deploy/enterprise/fs/opt/steedos/platform/steedos.config.js diff --git a/deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf index 1123ad66f9..cd89ef3e1a 100644 --- a/deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf +++ b/deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf @@ -1,6 +1,6 @@ [program:steedos] -directory=/app -command=/opt/steedos/run-with-env.sh ./node_modules/.bin/steedos start --config steedos.config.js +directory=/opt/steedos/platform/ +command=/opt/steedos/run-with-env.sh /opt/steedos/platform/node_modules/.bin/steedos start --config /opt/steedos/platform/steedos.config.js priority=15 autostart=true autorestart=true