From 2a375ae77c21d0ac88a955ac1303c650fae92445 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 26 Oct 2022 23:05:11 +0100 Subject: [PATCH] add healthcheck --- Dockerfile.ubuntu-1804 | 3 ++- Dockerfile.ubuntu-2004 | 5 +++-- Dockerfile.ubuntu-2204 | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804 index deaeee0..48d97f8 100644 --- a/Dockerfile.ubuntu-1804 +++ b/Dockerfile.ubuntu-1804 @@ -96,9 +96,10 @@ RUN echo "**** Get LinuxGSM Modules ****" \ # Add LinuxGSM cronjobs RUN echo "**** Create Cronjobs ****" -RUN (crontab -l 2>/dev/null; echo "*/1 * * * * /linuxgsm/*server monitor > /dev/null 2>&1") | crontab - RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab - +HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ] + RUN rm -f /linuxgsm/entrypoint.sh COPY entrypoint.sh /linuxgsm/entrypoint.sh RUN date > /time.txt diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index 8da200b..c7bc3ac 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -95,10 +95,11 @@ RUN echo "**** Get LinuxGSM Modules ****" \ && rm -rf /linuxgsm/LinuxGSM # Add LinuxGSM cronjobs -RUN echo "**** Create Cronjobs ****" -RUN (crontab -l 2>/dev/null; echo "*/1 * * * * /linuxgsm/*server monitor > /dev/null 2>&1") | crontab - +RUN echo "**** Create Cronjob ****" RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab - +HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ] + RUN rm -f /linuxgsm/entrypoint.sh COPY entrypoint.sh /linuxgsm/entrypoint.sh RUN date > /time.txt diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index 4f030ec..534b51e 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -95,10 +95,11 @@ RUN echo "**** Get LinuxGSM Modules ****" \ && rm -rf /linuxgsm/LinuxGSM # Add LinuxGSM cronjobs -RUN echo "**** Create Cronjobs ****" -RUN (crontab -l 2>/dev/null; echo "*/1 * * * * /linuxgsm/*server monitor > /dev/null 2>&1") | crontab - +RUN echo "**** Create Cronjob ****" RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab - +HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ] + RUN rm -f /linuxgsm/entrypoint.sh COPY entrypoint.sh /linuxgsm/entrypoint.sh RUN date > /time.txt