Revert "Added temporary tomcat image"

#####

## Image containing the full JDK

##

## Intended for use by builder images that need to unpack war files

## Runtime Java images should use the JRE only

#####

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

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

USER root

RUN yum makecache && \

    yum install -y java-11-openjdk-devel-11.0.15.0.9 && \

    yum clean all

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/jre11:${ESGF_IMAGES_VERSION} as builder

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

# Unpack the THREDDS war

ARG THREDDS_VERSION=5.4

#####

## Base image for all Tomcat runtime images

#####

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

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

USER root

# Create Tomcat home at /opt/tomcat

ENV JAVA_HOME /usr/lib/jvm/jre

ENV CATALINA_HOME /opt/tomcat

ENV PATH $CATALINA_HOME/bin:$PATH

RUN mkdir -p $CATALINA_HOME

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

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

    # Cleanup tar file, remove Windows scripts and default webapps

    rm -rf tomcat.tar.gz bin/*.bat webapps/* && \

    # Fix permissions - we want any user in the tomcat group to be able to run the container

    chmod -R +rX . && \

    chown -R $ESGF_USER:$ESGF_GROUP logs temp work && \

    chmod -R u+w,g+w logs temp work && \

    # Send tomcat logs to stdout by default

    ln -s /dev/stdout ./logs/localhost.log && \

    ln -s /dev/stdout ./logs/localhost_access_log.txt

# Install custom configs

COPY context.xml logging.properties server.xml tomcat-users.xml conf/

COPY setenv.sh bin/

# By default, execute the Tomcat server as the tomcat user

USER $ESGF_UID

CMD ["catalina.sh", "run"]

<?xml version="1.0" encoding="UTF-8"?>

<!--

  Licensed to the Apache Software Foundation (ASF) under one or more

  contributor license agreements.  See the NOTICE file distributed with

  this work for additional information regarding copyright ownership.

  The ASF licenses this file to You under the Apache License, Version 2.0

  (the "License"); you may not use this file except in compliance with

  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->

<!-- The contents of this file will be loaded for each web application -->

<Context>

    <!-- Default set of monitored resources. If one of these changes, the    -->

    <!-- web application will be reloaded.                                   -->

    <WatchedResource>WEB-INF/web.xml</WatchedResource>

    <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>

    <!-- Uncomment this to disable session persistence across Tomcat restarts -->

    <!--

    <Manager pathname="" />

    -->

   <Resources cachingAllowed="true" cacheMaxSize="100000" />

</Context>

# Make tomcat logs non-rotatable and remove unused handlers

handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler

.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler

############################################################

# Handler specific properties.

# Describes specific configuration info for Handlers.

############################################################

1catalina.org.apache.juli.AsyncFileHandler.level = FINE

1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs

1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.

1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8

# Make sure the files are not rotatable

1catalina.org.apache.juli.AsyncFileHandler.rotatable = false

2localhost.org.apache.juli.AsyncFileHandler.level = FINE

2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs

2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.

2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8

# Make sure the files are not rotatable

2localhost.org.apache.juli.AsyncFileHandler.rotatable = false

java.util.logging.ConsoleHandler.level = FINE

java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter

java.util.logging.ConsoleHandler.encoding = UTF-8

org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO

org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler