From 5ae71673bbb12d5fe9ed0cd3f8b9590f0ccc3602 Mon Sep 17 00:00:00 2001 From: Russ Sayers Date: Thu, 3 Sep 2020 19:11:00 +1000 Subject: [PATCH 1/2] DEVX-2039: Fix for elasticsearch vm.max_map_count bootstrap check --- microservices-orders/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/microservices-orders/docker-compose.yml b/microservices-orders/docker-compose.yml index f7e470a3e..5e3a91c47 100644 --- a/microservices-orders/docker-compose.yml +++ b/microservices-orders/docker-compose.yml @@ -262,6 +262,7 @@ services: - "9200:9200" - "9300:9300" environment: + discovery.type: "single-node" xpack.security.enabled: "false" XPACK_SECURITY_ENABLED: "false" xpack.monitoring.enabled: "false" From 16e76ba13e0f8c8725f7463f8878924f3a9b8e78 Mon Sep 17 00:00:00 2001 From: Russ Sayers Date: Thu, 3 Sep 2020 19:14:38 +1000 Subject: [PATCH 2/2] DEVX-2039: added test for log dir permissions --- microservices-orders/scripts/run-services.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/microservices-orders/scripts/run-services.sh b/microservices-orders/scripts/run-services.sh index 2f2460fb2..6544eb0f8 100755 --- a/microservices-orders/scripts/run-services.sh +++ b/microservices-orders/scripts/run-services.sh @@ -12,6 +12,12 @@ ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-""} LOG_DIR=${LOG_DIR:="logs"} PIDS_FILE=${PIDS_FILE:=".microservices.pids"} +# check if we can write to the log directory +if [ ! -w $LOG_DIR ]; then + echo "Unable to write to the logs dir with uid `id -u`. Logging to /tmp." + LOG_DIR=/tmp +fi + echo "Config File arg: $CONFIG_FILE_ARG" echo "Additional Args: $ADDITIONAL_ARGS" echo "Starting microservices from $JAR"