Unverified Commit aee360eb authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #202 from ESGF/log4j-bridge 

Log4j bridge
parents 1ca3b304 9a6d5b5a

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 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

ARG THREDDS_SHA1=04ebd7193c98c924e7c5d26aaf69d082b4926af2

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 && \