diff --git a/.gitignore b/.gitignore index 7df9343..c82a495 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ apps/agent/telemt-panel-agent.exe version.txt data/*.db data/*.db-* +out-deploy-test/ diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..1e108bb --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +inject-workspace-packages=true diff --git a/Dockerfile b/Dockerfile index 13480bf..5e04a4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && corepack enable -COPY package.json pnpm-workspace.yaml pnpm-lock.yaml turbo.json ./ +COPY package.json pnpm-workspace.yaml pnpm-lock.yaml turbo.json .npmrc ./ COPY apps/web/package.json apps/web/ COPY apps/api/package.json apps/api/ COPY packages/ui/package.json packages/ui/ @@ -31,6 +31,8 @@ RUN pnpm --filter @telemt/db build \ && pnpm --filter @telemt/web build \ && pnpm --filter @telemt/api build \ && pnpm --filter @telemt/api deploy --prod /out \ + && test -d /out/node_modules/fastify \ + && test -f /out/dist/server.js \ && cp -r apps/web/dist /out/static \ && mkdir -p /out/deploy \ && cp deploy/install-agent.sh /out/deploy/ \ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 39231c6..c769f63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,6 +3,7 @@ lockfileVersion: '9.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false + injectWorkspacePackages: true importers: