Commit 9cc5d2f0 authored by Reillyhewitson's avatar Reillyhewitson
Browse files

Adjustments for remaining docker builds 

search-builder does not work, included the changes I made to get it somewhere
search uses the existing search-builder latest.
parent d10c54e6

images/logstash/Dockerfile

+6 −1
Original line number Diff line number Diff line
@@ -18,7 +18,12 @@ ENV LS_SETTINGS_DIR /etc/logstash 
# Use Elastic's RPM repository to install logstash

# In the same command, in order to avoid another layer, transfer ownership of

# /usr/share/logstash to the ESGF user and group

COPY logstash.repo /etc/dnf.repos.d/logstash.repo

COPY logstash.repo /etc/yum.repos.d/logstash.repo



# SHA1 is disabled by default in rocky9. 

# Logstash does not have a SHA512 hash yet.

# So SHA1 needs to be enabled to install it.

RUN update-crypto-policies --set DEFAULT:SHA1

RUN dnf makecache && \

    dnf install -y logstash-7.10.0 && \

    dnf clean all && \

images/logstash/logstash.repo

+1 −1
Original line number Diff line number Diff line 
[logstash]

name=Elastic repository for 7.x packages

baseurl=https://artifacts.elastic.co/packages/7.x/dnf

baseurl=https://artifacts.elastic.co/packages/7.x/yum

gpgcheck=1

gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch

enabled=1

images/search-builder/Dockerfile

+27 −2
Original line number Diff line number Diff line
@@ -6,11 +6,36 @@ ARG ESGF_REPOSITORY_BASE=esgfdeploy 
ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION}



ARG IVY_VERSION=2.3.0

ARG IVY_URL=https://archive.apache.org/dist/ant/ivy/$IVY_VERSION/apache-ivy-$IVY_VERSION-bin-with-deps.tar.gz

ARG IVY_SHA512=073b497e5e45fa5dcca5881180ccde0a

ARG PYTHON_MD5=d235bdfa75b8396942e360a70487ee00



# Install dependencies

RUN dnf makecache && \

    dnf install -y git ant ivy && \

    dnf install -y git ant openssl-devel && \

    dnf -y groupinstall "development tools" && \

    dnf clean all



RUN curl -fsSl -o Python-2.7.18.tgz https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tgz

    #echo "$PYTHON_MD5 *Python-2.7.18.tgz" | md5sum --strict --check && \

RUN tar -xzf Python-2.7.18.tgz --strip-components=1

RUN ./configure --prefix=/usr/local --enable-shared --enable-unicode=ucs4

RUN make && make altinstall

ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/bin/python2.7:\$LD_LIBRARY_PATH



RUN python2.7 -m ensurepip --upgrade



RUN which python2.7

RUN cp /usr/local/bin/python2.7 /usr/bin/python



RUN curl -fsSl -o ivy.tar.gz $IVY_URL && \

    # echo "$IVY_SHA512 *ivy.tar.gz" | md5sum --strict --check && \

    tar -xzf ivy.tar.gz --strip-components=1 && \

    java -jar ivy-$IVY_VERSION.jar



RUN pip2 install ez_setup



# Build esgf-node-manager

ARG ESGF_NODE_MANAGER_VERSION=15682f64212782a56eacdb356432e9e21d643e1d

RUN git clone https://github.com/ESGF/esgf-node-manager.git /src/esgf-node-manager && \
@@ -18,7 +43,7 @@ RUN git clone https://github.com/ESGF/esgf-node-manager.git /src/esgf-node-manag 
    git checkout $ESGF_NODE_MANAGER_VERSION && \

    popd

RUN pushd /src/esgf-node-manager && \

    ant clean_all make_dist publish_local && \

    ant make_dist publish_local && \

    popd



# Build esgf-security

images/search/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ARG ESGF_IMAGES_VERSION=latest 


# Make a reference to the builder

# We have to do this as a FROM because we can't use variables in COPY --from

FROM ${ESGF_REPOSITORY_BASE}/search-builder:${ESGF_IMAGES_VERSION} as builder

FROM esgfdeploy/search-builder:latest as builder



# Build the runtime image

FROM ${ESGF_REPOSITORY_BASE}/tomcat:${ESGF_IMAGES_VERSION}
@@ -16,7 +16,7 @@ USER root 


RUN dnf makecache && \

    dnf remove -y java-11-openjdk-headless && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.345.b01 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.382.b05-2.el9.x86_64 && \

    dnf install -y zip && \

    dnf clean all

images/solr/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ USER root 


# Specific version of Java required by SOLR

RUN dnf makecache && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.345.b01 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.382.b05-2.el9.x86_64 && \

    dnf clean all



# Create Solr home directory