From 318aab120e6a9aa8760e20fdc450fe0b625c4479 Mon Sep 17 00:00:00 2001
From: Yannik Schmidt <sheppy@atlantishq.de>
Date: Wed, 15 Mar 2023 13:46:11 +0100
Subject: [PATCH] fix: docker entrypoint & healthcheck

---
 Dockerfile | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a2a5f5f..a2d4d4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,26 @@
 FROM python:3.9-slim-buster
 
 RUN apt update
-RUN apt install python3-pip git curl -y
-RUN python3 -m pip install waitress
+RUN apt install python3-pip -y
 RUN python3 -m pip install --upgrade pip
+RUN apt install curl -y
+RUN apt autoremove -y
+RUN apt clean
 
 WORKDIR /app
-COPY ./ .
 
-# precreate database directory for mount (will otherwise be created at before_first_request)
-RUN mkdir /app/instance/
+RUN python3 -m pip install waitress
 
+COPY req.txt .
 RUN python3 -m pip install --no-cache-dir -r req.txt
 
-#HEALTHCHECK --interval=5m --timeout=5s CMD /usr/bin/curl http://localhost:5000/ || exit 1
+# precreate database directory for mount (will otherwise be created at before_first_request)
+COPY ./ .
+RUN mkdir /app/instance/
+
+HEALTHCHECK --interval=1m --timeout=5s --start-period=10s \
+                CMD /usr/bin/curl --fail http://localhost:5000/ || exit 1
 EXPOSE 5000/tcp
 
-RUN apt remove git -y
-RUN apt autoremove -y
-
-CMD waitress-serve --host 0.0.0.0 --port 5000 --call 'app:createApp'
+ENTRYPOINT ["waitress-serve"]
+CMD ["--host", "0.0.0.0", "--port", "5000", "--call", "app:createApp" ]