Merge branch 'master' into PHRAS-4158-storytitle-nok

Author: nmaillat

docker-compose.datastores.yml

@@ -51,6 +51,10 @@ services:
 
   elasticsearch:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-elasticsearch:$PHRASEANET_DOCKER_TAG
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     profiles: ["elasticsearch"]
     build: ./docker/elasticsearch
     restart: on-failure

stack.sh

@@ -44,6 +44,11 @@ stack_status() {
 display_info() {
     echo "Checking environment information..."
     echo
+
+    # Kernel version (Linux and macOS compatible)
+    echo "Kernel Version:"
+    uname -sr
+    echo
 
     check_compose_version