diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index 46df1763b..ee7cd6986 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -24,4 +24,4 @@ FROM node:22.14.0-bullseye-slim # Configure container EXPOSE 8080 CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec gosu node node docker_healthcheck.js \ No newline at end of file + HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.js \ No newline at end of file diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine index d5b68c1fb..02b5604bb 100644 --- a/apps/server/Dockerfile.alpine +++ b/apps/server/Dockerfile.alpine @@ -22,4 +22,4 @@ FROM node:22.14.0-alpine # Configure container EXPOSE 8080 CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec su-exec node node docker_healthcheck.js \ No newline at end of file + HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.js \ No newline at end of file diff --git a/_regroup_monorepo/apps/server/docker_healthcheck.ts b/apps/server/src/docker_healthcheck.ts similarity index 87% rename from _regroup_monorepo/apps/server/docker_healthcheck.ts rename to apps/server/src/docker_healthcheck.ts index 262dc3ef2..c329d36e1 100644 --- a/_regroup_monorepo/apps/server/docker_healthcheck.ts +++ b/apps/server/src/docker_healthcheck.ts @@ -1,5 +1,5 @@ import http from "http"; -import config from "./src/services/config.js"; +import config from "./services/config.js"; if (config.Network.https) { // built-in TLS (terminated by trilium) is not supported yet, PRs are welcome @@ -7,8 +7,8 @@ if (config.Network.https) { process.exit(0); } -import port from "./src/services/port.js"; -import host from "./src/services/host.js"; +import port from "./services/port.js"; +import host from "./services/host.js"; const options: http.RequestOptions = { timeout: 2000 }; diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index bf11995ae..1b68537b8 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -58,6 +58,9 @@ module.exports = { optimization: false, outputHashing: 'none', generatePackageJson: true, + additionalEntryPoints: [ + "./src/docker_healthcheck.ts" + ], externalDependencies: [ "electron/main", "@electron/remote/main",