Merge pull request #2090 from jcantrill/es-cve

Rebuild elasticsearch to bump the version jackson dependency

Author: openshift-merge-robot

elasticsearch/Dockerfile.origin

@@ -22,9 +22,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \
     RECOVER_AFTER_TIME=5m \
     DHE_TMP_KEY_SIZE=2048 \
     RELEASE_STREAM=origin
-
 ARG MAVEN_REPO_URL=https://repo1.maven.org/maven2/
-
 RUN  yum install -y --nogpgcheck \
          https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
      packages="java-${JAVA_VER}-openjdk-headless \
@@ -39,7 +37,9 @@ RUN  yum install -y --nogpgcheck \
      yum clean all
 
 ADD extra-jvm.options ci-env.sh install-es.sh /var/tmp
+ENV ES_ARCHIVE_URL=https://github.com/openshift/origin-aggregated-logging/releases/download/elasticsearch-oss-6.8.1.redhat-00006/elasticsearch-oss-6.8.1.redhat-00006.zip
 
+RUN if [ ! -f "/usr/bin/python" ]; then ln -s /usr/bin/python3 /usr/bin/python ; fi
 RUN /var/tmp/install-es.sh
 
 ADD sgconfig/ ${HOME}/sgconfig/
@@ -51,7 +51,7 @@ ADD init.sh run.sh prep-install* ci-env.sh install.sh lib/tattletale/* ${HOME}/
 COPY utils/** /usr/local/bin/
 
 ARG PROMETHEUS_EXPORTER_URL=https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/6.8.1.0/prometheus-exporter-6.8.1.0.zip
-ARG OPENDISTRO_URL=https://github.com/jcantrill/security/releases/download/v0.10.1.0/opendistro_security-0.10.1.0.zip
+ARG OPENDISTRO_URL=https://github.com/openshift/origin-aggregated-logging/releases/download/opendistro_security-0.10.0.4-redhat-00001/opendistro_security-0.10.0.4-redhat-00001.zip
 
 RUN ${HOME}/install.sh
 

elasticsearch/Dockerfile.rhel8

@@ -8,14 +8,14 @@ USER 0
 
 ENV ES_PATH_CONF=/etc/elasticsearch/ \
     ES_HOME=/usr/share/elasticsearch \
-    ES_VER=6.8.1.redhat-6 \
+    ES_VER=6.8.1.redhat-00006 \
     HOME=/opt/app-root/src \
     INSTANCE_RAM=512G \
     JAVA_VER=11 \
     JAVA_HOME=/usr/lib/jvm/jre \
     NODE_QUORUM=1 \
     PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-1 \
-    OPENDISTRO_VER=0.10.1.0-redhat-1 \
+    OPENDISTRO_VER=0.10.0.4-redhat-00001 \
     PLUGIN_LOGLEVEL=INFO \
     RECOVER_AFTER_NODES=1 \
     RECOVER_EXPECTED_NODES=1 \

elasticsearch/fetch-artifacts-koji.yaml

@@ -1,4 +1,4 @@
-- nvr: org.elasticsearch-parent-6.8.1.redhat_6-1
+- nvr: org.elasticsearch-elasticsearch-6.8.1.redhat_00006-1
 - nvr: org.elasticsearch.plugin.prometheus-elasticsearch-prometheus-exporter-6.8.1.0_redhat_1-2
-- nvr: com.amazon.opendistroforelasticsearch-opendistro_security-0.10.1.0_redhat_1-1
+- nvr: com.amazon.opendistroforelasticsearch-opendistro_security-0.10.0.4_redhat_00001-1
 

elasticsearch/install-es.sh

@@ -9,7 +9,8 @@ source $(dirname "$0")/ci-env.sh
 # put files in correct places in image
 # fix up directory permissions and ownership
 cd /var/tmp
-curl -v -s -o es.zip ${MAVEN_REPO_URL}org/elasticsearch/distribution/zip/elasticsearch-oss/${ES_VER}/elasticsearch-oss-${ES_VER}.zip
+ES_ARCHIVE_URL=${ES_ARCHIVE_URL:-${MAVEN_REPO_URL}org/elasticsearch/distribution/zip/elasticsearch-oss/${ES_VER}/elasticsearch-oss-${ES_VER}.zip}
+curl -L -v -s -o es.zip ${ES_ARCHIVE_URL}
 unzip es.zip
 pushd elasticsearch-${ES_VER}
 mkdir -p ${ES_HOME}/bin
@@ -43,4 +44,4 @@ chmod u+rwx,g+rwx ${ES_HOME}/logs
 mkdir -p /var/run/elasticsearch
 chmod u+rwx,g+rwx /var/run/elasticsearch
 mkdir /elasticsearch && chmod og+w /elasticsearch
-rm -rf elasticsearch-${ES_VER} es.zip extra-jvm.options
+rm -rf elasticsearch-${ES_VER} es.zip extra-jvm.options