MCLOUD-8350: ES & OS improvements (#79)

BaDos · web-flow · commit fea4624dbda2 · 2021-12-22T11:43:26.000-06:00
diff --git a/images/elasticsearch/5.2/Dockerfile b/images/elasticsearch/5.2/Dockerfile
diff --git a/images/elasticsearch/5.2/docker-entrypoint.sh b/images/elasticsearch/5.2/docker-entrypoint.sh
diff --git a/images/elasticsearch/6.5/Dockerfile b/images/elasticsearch/6.5/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 
diff --git a/images/elasticsearch/6.8/Dockerfile b/images/elasticsearch/6.8/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/7.11/Dockerfile b/images/elasticsearch/7.11/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/7.5/Dockerfile b/images/elasticsearch/7.5/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/7.6/Dockerfile b/images/elasticsearch/7.6/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.6.2
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/7.7/Dockerfile b/images/elasticsearch/7.7/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.1
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/7.9/Dockerfile b/images/elasticsearch/7.9/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.3
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/images/elasticsearch/es/Dockerfile b/images/elasticsearch/es/Dockerfile
@@ -1,7 +1,10 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:{%version%}
 
-RUN yum -y install zip
-RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+RUN yum -y install zip && \
+    zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 {%single_node%}
diff --git a/images/opensearch/1.1/Dockerfile b/images/opensearch/1.1/Dockerfile
@@ -1,5 +1,13 @@
 FROM opensearchproject/opensearch:1.1.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 && \
     bin/opensearch-plugin install -b analysis-phonetic
 
diff --git a/images/opensearch/1.2/Dockerfile b/images/opensearch/1.2/Dockerfile
@@ -0,0 +1,21 @@
+FROM opensearchproject/opensearch:1.2.1
+
+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 && \
+    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
diff --git a/images/opensearch/1.2/docker-entrypoint.sh b/images/opensearch/1.2/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
diff --git a/images/opensearch/1.2/docker-healthcheck.sh b/images/opensearch/1.2/docker-healthcheck.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
-if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+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
diff --git a/images/opensearch/os/Dockerfile b/images/opensearch/os/Dockerfile
@@ -1,4 +1,12 @@
-FROM opensearchproject/opensearch:1.1.0
+FROM opensearchproject/opensearch:{%version%}
+
+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 && \
     bin/opensearch-plugin install -b analysis-phonetic
diff --git a/src/Command/Image/GenerateOs.php b/src/Command/Image/GenerateOs.php
@@ -31,6 +31,9 @@ class GenerateOs extends Command
         '1.1' => [
             'real-version' => '1.1.0',
         ],
+        '1.2' => [
+            'real-version' => '1.2.1',
+        ],
     ];
 
     /**
diff --git a/src/Test/Functional/Acceptance/Elasticsearch72Cest.php b/src/Test/Functional/Acceptance/Elasticsearch72Cest.php
@@ -24,7 +24,7 @@ protected function dataProvider(): array
     {
         return [
             [
-                'version' => '5.2',
+                'version' => '6.5',
                 'xms' => '516m',
                 'xmx' => '516m',
                 'param' => [
diff --git a/src/Test/Functional/Acceptance/Services72Cest.php b/src/Test/Functional/Acceptance/Services72Cest.php
@@ -15,7 +15,7 @@ class Services72Cest extends ServicesCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.3.0';
+    protected const TEMPLATE_VERSION = '2.3.1';
 
     /**
      * @return array
@@ -30,7 +30,7 @@ protected function servicesDataProvider(): array
                     'magento/magento-cloud-docker-varnish:6.2-1.3',
                     'magento/magento-cloud-docker-nginx:1.19-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2'
                 ],
                 'notExpectedResult' => ['rabbitmq', 'selenium/standalone-chrome:latest', 'cron'],
@@ -42,7 +42,7 @@ protected function servicesDataProvider(): array
                     'magento/magento-cloud-docker-varnish:6.2-1.3',
                     'magento/magento-cloud-docker-nginx:1.19-1.3',
                     'magento/magento-cloud-docker-php:7.4-fpm-1.3',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.1',
                     'rabbitmq:3.5'
                 ],
@@ -55,7 +55,7 @@ protected function servicesDataProvider(): array
                     'magento/magento-cloud-docker-varnish:6.2-1.3',
                     'magento/magento-cloud-docker-nginx:1.19-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
                     'rabbitmq:3.6'
                 ],
@@ -68,7 +68,7 @@ protected function servicesDataProvider(): array
                     'magento/magento-cloud-docker-varnish:6.2-1.3',
                     'magento/magento-cloud-docker-nginx:1.19-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
                     'cron',
                     'selenium/standalone-chrome:latest'
diff --git a/src/Test/Integration/BuildComposeTest.php b/src/Test/Integration/BuildComposeTest.php
@@ -137,7 +137,7 @@ public function buildDataProvider(): array
                     [CliSource::OPTION_WITH_CRON, true],
                     [CliSource::OPTION_WITH_ZOOKEEPER, true],
                     [CliSource::OPTION_WITH_XDEBUG, true],
-                    [CliSource::OPTION_ES, '5.2'],
+                    [CliSource::OPTION_ES, '6.5'],
                     [CliSource::OPTION_OS, '1.2'],
                     [CliSource::OPTION_NO_ES, true],
                     [CliSource::OPTION_NO_OS, true],
