tum 1 ay önce
ebeveyn
işleme
7e39c9d3b9
2 değiştirilmiş dosya ile 8 ekleme ve 8 silme
  1. 1 1
      Shuffle/docker-compose.yml
  2. 7 7
      run-combined-stack.sh

+ 1 - 1
Shuffle/docker-compose.yml

@@ -65,7 +65,7 @@ services:
65 65
     hostname: shuffle-opensearch
66 66
     container_name: shuffle-opensearch
67 67
     environment:
68
-      - "OPENSEARCH_JAVA_OPTS=-Xms3072m -Xmx3072m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
68
+      - "OPENSEARCH_JAVA_OPTS=${SHUFFLE_OPENSEARCH_JAVA_OPTS:--Xms1024m -Xmx1024m}" # override in .env for larger hosts
69 69
       - bootstrap.memory_lock=true
70 70
       - DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true
71 71
       - cluster.initial_master_nodes=shuffle-opensearch

+ 7 - 7
run-combined-stack.sh

@@ -67,7 +67,7 @@ run_wazuh() {
67 67
     --project-directory "${ROOT_DIR}/wazuh-docker/single-node" \
68 68
     -f "${ROOT_DIR}/wazuh-docker/single-node/docker-compose.yml" \
69 69
     -f "${ROOT_DIR}/compose-overrides/wazuh.shared-network.yml" \
70
-    "${COMMAND}" "${ARGS[@]}"
70
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
71 71
 }
72 72
 
73 73
 run_iris() {
@@ -76,7 +76,7 @@ run_iris() {
76 76
     --project-directory "${ROOT_DIR}/iris-web" \
77 77
     -f "${ROOT_DIR}/iris-web/docker-compose.yml" \
78 78
     -f "${ROOT_DIR}/compose-overrides/iris.shared-network.yml" \
79
-    "${COMMAND}" "${ARGS[@]}"
79
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
80 80
 }
81 81
 
82 82
 run_shuffle() {
@@ -85,7 +85,7 @@ run_shuffle() {
85 85
     --project-directory "${ROOT_DIR}/Shuffle" \
86 86
     -f "${ROOT_DIR}/Shuffle/docker-compose.yml" \
87 87
     -f "${ROOT_DIR}/compose-overrides/shuffle.shared-network.yml" \
88
-    "${COMMAND}" "${ARGS[@]}"
88
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
89 89
 }
90 90
 
91 91
 run_pagerduty_stub() {
@@ -93,7 +93,7 @@ run_pagerduty_stub() {
93 93
     --project-name pagerduty-stub \
94 94
     --project-directory "${ROOT_DIR}" \
95 95
     -f "${ROOT_DIR}/compose-overrides/pagerduty.stub.yml" \
96
-    "${COMMAND}" "${ARGS[@]}"
96
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
97 97
 }
98 98
 
99 99
 run_soc_integrator() {
@@ -101,7 +101,7 @@ run_soc_integrator() {
101 101
     --project-name soc-integrator \
102 102
     --project-directory "${ROOT_DIR}/compose-overrides" \
103 103
     -f "${ROOT_DIR}/compose-overrides/soc-integrator.yml" \
104
-    "${COMMAND}" "${ARGS[@]}"
104
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
105 105
 }
106 106
 
107 107
 run_target() {
@@ -222,7 +222,7 @@ elif [[ "${COMMAND}" == "logs" ]]; then
222 222
       run_logs_for_target "all"
223 223
       ;;
224 224
     *)
225
-      for arg in "${ARGS[@]}"; do
225
+      for arg in ${ARGS[@]+"${ARGS[@]}"}; do
226 226
         if [[ "${arg}" == "-f" || "${arg}" == "--follow" ]]; then
227 227
           echo "For follow mode, specify one target:"
228 228
           echo "./run-combined-stack.sh logs <wazuh|iris|shuffle|pagerduty|integrator> -f"
@@ -242,7 +242,7 @@ elif [[ "${COMMAND}" == "up" ]]; then
242 242
     all|--all)
243 243
       ARGS=("${ARGS[@]:1}")
244 244
       HAS_DETACH="false"
245
-      for arg in "${ARGS[@]}"; do
245
+      for arg in ${ARGS[@]+"${ARGS[@]}"}; do
246 246
         if [[ "${arg}" == "-d" || "${arg}" == "--detach" ]]; then
247 247
           HAS_DETACH="true"
248 248
           break