From 1efe5562769285ca2a7c7f073739cab059048e5f Mon Sep 17 00:00:00 2001 From: Noxcis Date: Tue, 8 Oct 2024 02:11:19 -0500 Subject: [PATCH] fix health check --- Dockerfile | 10 +++------- client/src/components/Welcome/index.jsx | 3 +-- docker-compose.yaml | 5 +---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 827b475..38c9904 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,13 +31,9 @@ COPY start.sh /opt/app/start.sh RUN chmod +x /opt/app/start.sh - - - - - -HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \ - CMD [ "curl", "-f", "http://localhost:3001", "||", "exit", "1" ] + +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD \ + sh -c 'pgrep nginx > /dev/null && pgrep node > /dev/null' || exit 1 CMD ["/opt/app/start.sh", "start" ] diff --git a/client/src/components/Welcome/index.jsx b/client/src/components/Welcome/index.jsx index 030939d..999d419 100644 --- a/client/src/components/Welcome/index.jsx +++ b/client/src/components/Welcome/index.jsx @@ -10,8 +10,7 @@ const Welcome = ({ roomId, translations, close }) => {
  • Support on all modern browsers (Chrome, Firefox, Safari, Safari iOS, Android)
  • Slash commands (/nick, /me, /clear)
  • Room owners can lock the room, preventing anyone else from joining
  • -
  • Front-end rewritten in React.js and Redux
  • -
  • Send files up to 4 MB
  • +
  • Send files
  • You can learn more{' '} diff --git a/docker-compose.yaml b/docker-compose.yaml index bc232d8..2b256bd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,8 +6,7 @@ services: cap_add: - NET_ADMIN - SYS_MODULE - networks: - - db + ports: - 3002:80 - 4001:443 @@ -16,5 +15,3 @@ services: - net.ipv4.ip_forward=1 - net.ipv4.conf.all.src_valid_mark=1 -networks: - db: \ No newline at end of file