Merge pull request #684 from bijancot/main

karrioapi · Sep 12, 2024 · 53b98fe · 53b98fe
2 parents d9afa1f + f93251f
commit 53b98fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
@@ -6,6 +6,7 @@ ARG REGISTRY_TOKEN
 ARG REGISTRY_TOKEN_NAME
 
 RUN apt-get update -y && apt-get install -y gcc
+
 RUN python -m venv /karrio/venv
 ENV PATH="/karrio/venv/bin:$PATH"
 COPY "${REQUIREMENTS}" /temp/
@@ -42,7 +43,7 @@ ENV LOG_DIR /karrio/log
 ENV WORKER_DB_DIR /karrio/data
 ENV STATIC_ROOT_DIR /karrio/static
 
-RUN apt-get update -y && apt-get install -y libpango1.0-0 libpangoft2-1.0-0 gcc ghostscript
+RUN apt-get update -y && apt-get install -y libpango1.0-0 libpangoft2-1.0-0 gcc ghostscript curl
 RUN useradd -m karrio -d /karrio
 USER karrio
 COPY --chown=karrio:karrio --from=compile-image /karrio/ /karrio/

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -8,6 +8,12 @@ services:
     depends_on:
       - db
       - redis
+    healthcheck:
+      test: curl --fail http://api:5002/ || exit 1
+      interval: 40s
+      timeout: 30s
+      retries: 5
+      start_period: 60s
     environment:
       DEBUG_MODE: "True"
       DETACHED_WORKER: "True"
@@ -49,7 +55,9 @@ services:
     ports:
       - ${DASHBOARD_PORT}:3000/tcp
     depends_on:
-      - api
+      api:
+        condition: service_healthy
+        restart: true
     environment:
       KARRIO_URL: http://api:${KARRIO_HTTP_PORT:-5002}
       NEXTAUTH_SECRET: ${JWT_SECRET}
@@ -91,4 +99,4 @@ services:
 
 volumes:
   postgres-data:
-  redis-data:
+  redis-data: