Merge pull request #1892 from periklis/migrate-ubi

Migrate image building to a single UBI7-based Dockerfile

Author: openshift-merge-robot

curator/Dockerfile

@@ -1,4 +1,4 @@
-FROM rhel7:7-released
+FROM ubi7/python-36:latest
 
 MAINTAINER OpenShift Development <[email protected]>
 
@@ -16,27 +16,26 @@ ENV HOME=/opt/app-root/src \
     CURATOR_TIMEOUT=300 \
     CURATOR_VER=5.8.1 \
     container=oci \
-    LC_ALL=en_US.UTF-8 
+    LC_ALL=en_US.UTF-8
 
-LABEL io.k8s.description="Curator elasticsearch container for elasticsearch deletion/archival" \
-  io.k8s.display-name="Curator ${CURATOR_VER}" \
-  io.openshift.tags="logging,elk,elasticsearch,curator"
+USER 0
+COPY . ${HOME}
 
-RUN yum install -y python3 && \
-    yum clean all && \
-    ln -sf /usr/bin/python3 /usr/bin/python
+#
+# TODO Remove after openshift/release provides ubi7/python36 base image
+#
+RUN ${HOME}/install-centos7-deps.sh
 
-COPY . ${HOME}
 RUN mkdir -p $(dirname "$CURATOR_CONF_LOCATION") && \
     touch ${CURATOR_CONF_LOCATION} && \
     chmod -R u+x ${HOME} && \
     chgrp -R 0 ${HOME} && \
     chmod -R g=u ${HOME}
+
 WORKDIR ${HOME}/vendor
-RUN pip3 install $(ls . | grep -v curator) -q --no-index --find-links . && \
-    pip3 install elasticsearch-curator* --no-index -q && \
-    rm -rf $HOME/vendor && \
-    ls /usr/local/bin/curator
+RUN pip install $(ls . | grep -v curator) -q --no-index --find-links . && \
+    pip install elasticsearch-curator* --no-index -q && \
+    rm -rf $HOME/vendor
 
 WORKDIR ${HOME}
 USER 1001

curator/Dockerfile.centos7

@@ -0,0 +1 @@
+Dockerfile

curator/Dockerfile.centos7

@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ -f /etc/centos-release ] ; then
+    echo "Installing temporarily centos 7 deps for CI"
+    yum install -y python3
+    yum clean all
+    ln -sf /usr/bin/python3 /usr/bin/python
+    ln -sf /usr/bin/pip3 /usr/bin/pip
+fi

curator/install-centos7-deps.sh

@@ -1,4 +1,4 @@
-FROM openshift/ose-base:ubi7
+FROM ubi7:latest
 
 MAINTAINER OpenShift Development <[email protected]>
 

elasticsearch/Dockerfile

@@ -0,0 +1 @@
+Dockerfile.origin

elasticsearch/Dockerfile.centos7

@@ -0,0 +1,61 @@
+FROM ubi7:latest
+
+MAINTAINER OpenShift Development <[email protected]>
+
+EXPOSE 9200
+EXPOSE 9300
+USER 0
+
+ENV ES_PATH_CONF=/etc/elasticsearch/ \
+    ES_HOME=/usr/share/elasticsearch \
+    ES_VER=6.8.1 \
+    HOME=/opt/app-root/src \
+    INSTANCE_RAM=512G \
+    JAVA_VER=1.8.0 \
+    JAVA_HOME=/usr/lib/jvm/jre \
+    NODE_QUORUM=1 \
+    PROMETHEUS_EXPORTER_VER=6.8.1.0 \
+    OPENDISTRO_VER=0.10.1.0 \
+    PLUGIN_LOGLEVEL=INFO \
+    RECOVER_AFTER_NODES=1 \
+    RECOVER_EXPECTED_NODES=1 \
+    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 --setopt=tsflags=nodocs --nogpgcheck \
+         https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
+     packages="java-${JAVA_VER}-openjdk-headless \
+              PyYAML  \
+              hostname \
+              openssl \
+              zip \
+              unzip \
+              jq" && \
+     yum install -y --setopt=tsflags=nodocs ${packages} && \
+     rpm -V ${packages} && \
+     yum clean all
+
+ADD extra-jvm.options install-es.sh /var/tmp
+
+RUN /var/tmp/install-es.sh
+
+ADD sgconfig/ ${HOME}/sgconfig/
+ADD index_templates/ ${ES_HOME}/index_templates/
+ADD index_patterns/ ${ES_HOME}/index_patterns/
+ADD init/ ${ES_HOME}/init/
+ADD kibana_ui_objects/ ${ES_HOME}/kibana_ui_objects/
+ADD probe/ ${ES_HOME}/probe/
+ADD init.sh run.sh prep-install* install.sh ${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
+
+RUN ${HOME}/install.sh
+
+WORKDIR ${HOME}
+USER 1000
+CMD ["sh", "/opt/app-root/src/run.sh"]

elasticsearch/Dockerfile.centos7

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euxo pipefail
+set -euo pipefail
 
 # install Elasticsearch from zip distribution file
 # put files in correct places in image

elasticsearch/Dockerfile.origin

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euxo pipefail
+set -euo pipefail
 
 ln -s /usr/local/bin/logging ${HOME}/logging