diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 34196ab21dfc13928a81262eb52f42e1820c3cb5..f3fae6d69da44432fc9082a7e308756c9624750b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -39,7 +39,7 @@ COPY ["resources/config.json", "/files/"] # Healthcheck COPY --chown=$UID /resources/healthcheck.mjs /hedgedoc/healthcheck.mjs -HEALTHCHECK --interval=5s CMD node healthcheck.mjs +HEALTHCHECK --interval=15s CMD node healthcheck.mjs # For backwards compatibility RUN ln -s /hedgedoc /codimd diff --git a/debian/Dockerfile b/debian/Dockerfile index d73eed74ce5057ad7c7ef30c3cee87a25db10704..ea84cd72a7d2259a9799a6f93715373fffb72ac9 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -43,7 +43,7 @@ COPY ["resources/config.json", "/files/"] # Healthcheck COPY --chown=$UID /resources/healthcheck.mjs /hedgedoc/healthcheck.mjs -HEALTHCHECK --interval=5s CMD node healthcheck.mjs +HEALTHCHECK --interval=15s CMD node healthcheck.mjs # For backwards compatibility RUN ln -s /hedgedoc /codimd diff --git a/resources/healthcheck.mjs b/resources/healthcheck.mjs index 68371566b31ab6b84c2ee8decfe5faccc682963a..31ed206aeffd5cf4ef800c2900312e90d0e27221 100644 --- a/resources/healthcheck.mjs +++ b/resources/healthcheck.mjs @@ -5,10 +5,15 @@ setTimeout(() => { process.exit(1) }, 5000) -fetch(`http://localhost:${process.env.CMD_PORT || '3000' }/status`, {headers: { "user-agent": "hedgedoc-container-healthcheck/1.0"}}).then((response) => { +fetch(`http://localhost:${process.env.CMD_PORT || '3000' }/_health`, {headers: { "user-agent": "hedgedoc-container-healthcheck/1.1"}}).then((response) => { if (!response.ok) { process.exit(1) } + return response.json() +}).then((data) => { + if (!data.ready) { + process.exit(1) + } process.exit(0) }).catch(() => { process.exit(1)