Commit 095ba855 authored by watucker's avatar watucker
Browse files

Merge branch 'master' into rocky9-alma9

parents 4dfd08cc 0ab69b07

images/search/Dockerfile

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ USER root 
RUN yum makecache && \

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

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

    yum install -y zip && \

    yum clean all



# Copy the unpacked webapp from the builder
@@ -26,4 +27,22 @@ COPY log4j.xml ./webapps/esg-search/WEB-INF/classes/ 
# By default, send the search log to stdout

RUN ln -s /dev/stdout ./logs/esgf-search.log



ARG LIB_PATH=/opt/tomcat/webapps/esg-search/WEB-INF/lib



# Remove all Log4j jars and classes

RUN rm -f $LIB_PATH/log4j-1.2.17.jar

RUN zip $LIB_PATH/esgf-node-manager-accesslog-client-1.0.5.jar -d org/apache/log4j/\*

RUN zip $LIB_PATH/esgf-node-manager-connector-1.0.5.jar -d org/apache/log4j/\*



# Install Log4j 1.x to 2.x jars

RUN export JAR=log4j-1.2-api-2.20.0.jar && \

    curl https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-1.2-api/2.20.0/$JAR --output $LIB_PATH/$JAR && \

    echo "689151374756cb809cb029f2501015bdc7733179 *$LIB_PATH/$JAR" | sha1sum --strict --check

RUN export JAR=log4j-core-2.20.0.jar && \

    curl https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.20.0/$JAR --output $LIB_PATH/$JAR && \

    echo "eb2a9a47b1396e00b5eee1264296729a70565cc0 *$LIB_PATH/$JAR" | sha1sum --strict --check

RUN export JAR=log4j-api-2.20.0.jar && \

    curl https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.20.0/$JAR --output $LIB_PATH/$JAR && \

    echo "1fe6082e660daf07c689a89c94dc0f49c26b44bb *$LIB_PATH/$JAR" | sha1sum --strict --check



USER $ESGF_UID

images/thredds/Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

# Keep SHA1 value up to date - changes cause the checksum to fail

ARG THREDDS_SHA1=cd9063eb5053ffcfea75ae8d65ead734a162a91d

ARG THREDDS_SHA1=ff6f378892cdd78a1c686802325d7a6021c78253

ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war

RUN mkdir /application && \

    cd /application && \

images/tomcat/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ WORKDIR $CATALINA_HOME 


# Download and install Tomcat 8

ARG TOMCAT_MAJOR_VERSION=8

ARG TOMCAT_VERSION=8.5.57

ARG TOMCAT_SHA512=720de36bb3e40a4c67bdf0137b12ae0fd733aef772d81a4b8dab00f29924ddd17ecb2a7217b9551fc0ca51bd81d1da13ad63b6694c445e5c0e42dfa7f279ede1

ARG TOMCAT_VERSION=8.5.81

ARG TOMCAT_SHA512=729387275cce4a0900289722f6c70ebcf7aee924af671b110b8ea8577fd6d045d47f17d526c8db5fd41c8590102e7f5100e95e89f7fd511b941565812ecbed35

ARG TOMCAT_URL=https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR_VERSION/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

RUN curl -fsSL -o tomcat.tar.gz $TOMCAT_URL && \

    echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check && \