Update requirements and setup Docker healthchecks

docker-compose.yml

@@ -15,7 +15,10 @@ services:
     volumes_from:
         - tmp
     depends_on:
-        - migration
+      redis:
+        condition: service_healthy
+      migration:
+        condition: service_started
 
   migration:
     image: pathogen/neptune:latest
@@ -24,6 +27,11 @@ services:
       - ${PORTAINER_GIT_DIR}:/code
       - ${NEPTUNE_LOCAL_SETTINGS}:/code/app/local_settings.py
       - ${NEPTUNE_DATABASE_FILE}:/code/db.sqlite3
+    volumes_from:
+      - tmp
+    depends_on:
+      redis:
+        condition: service_healthy
 
   # pyroscope:
   #   image: pyroscope/pyroscope
@@ -38,15 +46,20 @@ services:
     image: busybox
     command: chmod -R 777 /var/run/redis
     volumes:
-        - /var/run/redis
+      - /var/run/redis
 
   redis:
-      image: redis
+    image: redis
-      command: redis-server /etc/redis.conf
+    command: redis-server /etc/redis.conf
-      volumes:
+    volumes:
-          - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
+      - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
-      volumes_from:
+    volumes_from:
-          - tmp
+      - tmp
+    healthcheck:
+      test: "redis-cli -s /var/run/redis/redis.sock ping"
+      interval: 2s
+      timeout: 2s
+      retries: 15
 
 networks:
    default:

docker/docker-compose.prod.yml

@@ -14,9 +14,12 @@ services:
     env_file:
       - ../stack.env
     volumes_from:
-        - tmp
+      - tmp
     depends_on:
-      - migration
+      redis:
+        condition: service_healthy
+      migration:
+        condition: service_started
 
   migration:
     image: pathogen/neptune:latest
@@ -26,20 +29,30 @@ services:
       - ${PORTAINER_GIT_DIR}:/code
       - ${NEPTUNE_LOCAL_SETTINGS}:/code/app/local_settings.py
       - ${NEPTUNE_DATABASE_FILE}:/code/db.sqlite3
+    volumes_from:
+      - tmp
+    depends_on:
+      redis:
+        condition: service_healthy
 
   tmp:
     image: busybox
     command: chmod -R 777 /var/run/redis
     volumes:
-        - /var/run/redis
+      - /var/run/redis
 
   redis:
-      image: redis
+    image: redis
-      command: redis-server /etc/redis.conf
+    command: redis-server /etc/redis.conf
-      volumes:
+    volumes:
-          - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
+        - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
-      volumes_from:
+    volumes_from:
-          - tmp
+        - tmp
+    healthcheck:
+      test: "redis-cli -s /var/run/redis/redis.sock ping"
+      interval: 2s
+      timeout: 2s
+      retries: 15
 
 networks:
    default:

docker/prod/requirements.prod.txt

@@ -2,7 +2,7 @@ wheel
 django
 django-crispy-forms
 crispy-bulma
-opensearch-py
+#opensearch-py
 stripe
 django-rest-framework
 numpy
@@ -14,7 +14,9 @@ cryptography
 siphashc
 redis
 sortedcontainers
-manticoresearch
+#manticoresearch
 django-debug-toolbar
 django-debug-toolbar-template-profiler
 ujson
+orjson
+pydruid

docker/requirements.dev.txt

@@ -2,7 +2,7 @@ wheel
 django
 django-crispy-forms
 crispy-bulma
-opensearch-py
+#opensearch-py
 stripe
 django-rest-framework
 numpy
@@ -13,7 +13,9 @@ cryptography
 siphashc
 redis
 sortedcontainers
-manticoresearch
+#manticoresearch
 django-debug-toolbar
 django-debug-toolbar-template-profiler
 ujson
+orjson
+pydruid

requirements.txt

@@ -3,7 +3,7 @@ django
 pre-commit
 django-crispy-forms
 crispy-bulma
-opensearch-py
+#opensearch-py
 stripe
 django-rest-framework
 numpy
@@ -14,7 +14,9 @@ cryptography
 siphashc
 redis
 sortedcontainers
-manticoresearch
+#manticoresearch
 django-debug-toolbar
 django-debug-toolbar-template-profiler
 ujson
+orjson
+pydruid