mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-08 02:24:26 +00:00
Merge branch 'master' into PHRAS-4158-storytitle-nok
This commit is contained in:
@@ -51,6 +51,10 @@ services:
|
|||||||
|
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-elasticsearch:$PHRASEANET_DOCKER_TAG
|
image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-elasticsearch:$PHRASEANET_DOCKER_TAG
|
||||||
|
ulimits:
|
||||||
|
nofile:
|
||||||
|
soft: 65536
|
||||||
|
hard: 65536
|
||||||
profiles: ["elasticsearch"]
|
profiles: ["elasticsearch"]
|
||||||
build: ./docker/elasticsearch
|
build: ./docker/elasticsearch
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
|
5
stack.sh
5
stack.sh
@@ -45,6 +45,11 @@ display_info() {
|
|||||||
echo "Checking environment information..."
|
echo "Checking environment information..."
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
# Kernel version (Linux and macOS compatible)
|
||||||
|
echo "Kernel Version:"
|
||||||
|
uname -sr
|
||||||
|
echo
|
||||||
|
|
||||||
check_compose_version
|
check_compose_version
|
||||||
|
|
||||||
local env_files=($(get_env_files))
|
local env_files=($(get_env_files))
|
||||||
|
Reference in New Issue
Block a user