Skip to content

Build your personal knowledge base with Trilium Notes

chore(healthcheck): probe every minute, and declare the real timeout

Elian Dorana05d1e95180a
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index 2c5d013a91..f83b0ca698 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -22,4 +22,4 @@ COPY ./start-docker.sh /usr/src/app
# Configure container
EXPOSE 8080
CMD [ "sh", "./start-docker.sh" ]
-HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs
+HEALTHCHECK --interval=60s --timeout=5s --start-period=30s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs
diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine
index 2dbca62831..c7fdb418bc 100644
--- a/apps/server/Dockerfile.alpine
+++ b/apps/server/Dockerfile.alpine
@@ -20,4 +20,4 @@ RUN adduser -s /bin/false node; exit 0
# Configure container
EXPOSE 8080
CMD [ "sh", "./start-docker.sh" ]
-HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs
\ No newline at end of file
+HEALTHCHECK --interval=60s --timeout=5s --start-period=30s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs
\ No newline at end of file
diff --git a/apps/server/Dockerfile.alpine.rootless b/apps/server/Dockerfile.alpine.rootless
index 10ee164b2c..4a198a637d 100644
--- a/apps/server/Dockerfile.alpine.rootless
+++ b/apps/server/Dockerfile.alpine.rootless
@@ -39,4 +39,4 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
# Use the entrypoint script
CMD [ "bash", "./rootless-entrypoint.sh" ]
-HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js
+HEALTHCHECK --interval=60s --timeout=5s --start-period=30s CMD node /home/${USER}/app/docker_healthcheck.js
diff --git a/apps/server/Dockerfile.legacy b/apps/server/Dockerfile.legacy
index 0ecede0b8e..bdf9658c08 100644
--- a/apps/server/Dockerfile.legacy
+++ b/apps/server/Dockerfile.legacy
@@ -44,4 +44,4 @@ COPY ./start-docker.sh /usr/src/app
# Configure container
EXPOSE 8080
CMD [ "sh", "./start-docker.sh" ]
-HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs
\ No newline at end of file
+HEALTHCHECK --interval=60s --timeout=5s --start-period=30s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs
\ No newline at end of file
diff --git a/apps/server/Dockerfile.rootless b/apps/server/Dockerfile.rootless
index cbee06852a..ab29de0632 100644
--- a/apps/server/Dockerfile.rootless
+++ b/apps/server/Dockerfile.rootless
@@ -37,4 +37,4 @@ ENV TRILIUM_DATA_DIR=/home/${USER}/trilium-data
# Use the entrypoint script
CMD [ "bash", "./rootless-entrypoint.sh" ]
-HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js
+HEALTHCHECK --interval=60s --timeout=5s --start-period=30s CMD node /home/${USER}/app/docker_healthcheck.js
diff --git a/apps/server/scripts/build.ts b/apps/server/scripts/build.ts
index bdf4b4124a..f10efa038d 100644
--- a/apps/server/scripts/build.ts
+++ b/apps/server/scripts/build.ts
@@ -39,7 +39,7 @@ async function main() {
}
/**
- * Docker runs the healthcheck every 30 seconds, and each run is a cold node process that parses
+ * Docker runs the healthcheck every 60 seconds, and each run is a cold node process that parses
* the whole bundle. It resolves its target in healthcheck_target.ts rather than through config.ts
* so that it pulls in nothing else; importing a server service here costs megabytes and puts that
* cost on every probe. The limit is generous, so tripping it means a dependency crept back in.