diff --git a/docker-compose.yml b/docker-compose.yml index a07a582..6802587 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,16 +85,16 @@ services: - node.name=opensearch-node - discovery.type=single-node - bootstrap.memory_lock=false - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx1g" + - "OPENSEARCH_JAVA_OPTS=-Xms256m -Xmx512m --add-opens=java.base/java.lang=ALL-UNNAMED" - "DISABLE_INSTALL_DEMO_CONFIG=true" - "DISABLE_SECURITY_PLUGIN=true" - "DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true" deploy: resources: limits: - memory: 2G - reservations: memory: 1G + reservations: + memory: 512M ulimits: memlock: soft: -1 diff --git a/opensearch.Dockerfile b/opensearch.Dockerfile index 4667a56..1ad65f4 100644 --- a/opensearch.Dockerfile +++ b/opensearch.Dockerfile @@ -42,12 +42,22 @@ RUN mkdir -p /usr/share/opensearch/data && \ echo "node.name: opensearch-node" >> /usr/share/opensearch/config/opensearch.yml && \ echo "bootstrap.memory_lock: false" >> /usr/share/opensearch/config/opensearch.yml && \ echo "network.host: 0.0.0.0" >> /usr/share/opensearch/config/opensearch.yml && \ + echo "logger.level: DEBUG" >> /usr/share/opensearch/config/opensearch.yml && \ rm -rf /usr/share/opensearch/plugins/opensearch-performance-analyzer && \ + echo '#!/bin/bash' > /usr/share/opensearch/start-opensearch.sh && \ + echo 'echo "Starting OpenSearch with Java 21..."' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'echo "Java version:"' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'java -version' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'echo "Memory info:"' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'free -h 2>/dev/null || echo "Memory info not available"' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'echo "Starting OpenSearch process..."' >> /usr/share/opensearch/start-opensearch.sh && \ + echo 'exec /usr/share/opensearch/bin/opensearch' >> /usr/share/opensearch/start-opensearch.sh && \ + chmod +x /usr/share/opensearch/start-opensearch.sh && \ chown -R opensearch:opensearch /usr/share/opensearch USER opensearch EXPOSE 9200 9300 -# Use direct startup command since we're using the tarball distribution -ENTRYPOINT ["/usr/share/opensearch/bin/opensearch"] \ No newline at end of file +# Use startup script for better debugging +ENTRYPOINT ["/usr/share/opensearch/start-opensearch.sh"] \ No newline at end of file