Merge branch 'develop' into MCLOUD-13311

Author: amanKumar-15

images/opensearch/1.3/Dockerfile

@@ -1,11 +1,5 @@
 FROM opensearchproject/opensearch:1.3.0
 
-USER root
-RUN yum -y install zip && \
-    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
-    yum remove -y zip && \
-    yum -y clean all && \
-    rm -rf /var/cache
 USER opensearch
 
 RUN bin/opensearch-plugin install -b analysis-icu && \

images/opensearch/2.12/Dockerfile

@@ -1,11 +1,5 @@
 FROM opensearchproject/opensearch:2.12.0
 
-USER root
-RUN yum -y install zip && \
-    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
-    yum remove -y zip && \
-    yum -y clean all && \
-    rm -rf /var/cache
 USER opensearch
 
 RUN bin/opensearch-plugin install -b analysis-icu && \

images/opensearch/2.3/Dockerfile

@@ -1,11 +1,5 @@
 FROM opensearchproject/opensearch:2.3.0
 
-USER root
-RUN yum -y install zip && \
-    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
-    yum remove -y zip && \
-    yum -y clean all && \
-    rm -rf /var/cache
 USER opensearch
 
 RUN bin/opensearch-plugin install -b analysis-icu && \

images/opensearch/2.4/Dockerfile

@@ -1,11 +1,5 @@
 FROM opensearchproject/opensearch:2.4.0
 
-USER root
-RUN yum -y install zip && \
-    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
-    yum remove -y zip && \
-    yum -y clean all && \
-    rm -rf /var/cache
 USER opensearch
 
 RUN bin/opensearch-plugin install -b analysis-icu && \

images/opensearch/2.5/Dockerfile

@@ -1,11 +1,5 @@
 FROM opensearchproject/opensearch:2.5.0
 
-USER root
-RUN yum -y install zip && \
-    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
-    yum remove -y zip && \
-    yum -y clean all && \
-    rm -rf /var/cache
 USER opensearch
 
 RUN bin/opensearch-plugin install -b analysis-icu && \

images/opensearch/3.0/Dockerfile

@@ -0,0 +1,15 @@
+FROM opensearchproject/opensearch:3.0.0
+
+USER opensearch
+
+RUN bin/opensearch-plugin install -b analysis-icu && \
+    bin/opensearch-plugin install -b analysis-phonetic
+
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+ADD docker-entrypoint.sh /docker-entrypoint.sh
+
+HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 9200 9300

images/opensearch/3.0/docker-entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if [[ -n "$OS_PLUGINS" ]]; then
+  echo "Installing plugins: $OS_PLUGINS"
+  for PLUGIN in $OS_PLUGINS
+  do
+      ./bin/opensearch-plugin install -b "$PLUGIN"
+  done
+fi
+
+/bin/bash /usr/share/opensearch/opensearch-docker-entrypoint.sh

images/opensearch/3.0/docker-healthcheck.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${OS_HOST:-opensearch}:${OS_HOST:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1