Skip to content

Commit

Permalink
Merge pull request #42 from peichman-umd/feature/LIBFCREPO-1104
Browse files Browse the repository at this point in the history
LIBFCREPO-1104. Update the base tomcat and maven docker images to ones that supports arm64 builds.
  • Loading branch information
peichman-umd authored Oct 31, 2022
2 parents d6b5735 + c2bb9a6 commit 0400220
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
# docker build -t docker.lib.umd.edu/fcrepo-webapp:<VERSION> -f Dockerfile .
#
# where <VERSION> is the Docker image version to create.
FROM maven:3.6.3-jdk-8-slim AS compile
FROM maven:3.8.6-eclipse-temurin-11 AS compile

ENV SOURCE_DIR /opt/umd-fcrepo-webapp
COPY src $SOURCE_DIR/src
COPY pom.xml $SOURCE_DIR
WORKDIR $SOURCE_DIR
RUN mvn package -DwarFileName=umd-fcrepo-webapp

# Note: Specifying SHA256 hash (for the "linux/amd64" architecture) to ensure Docker base image consistency
FROM tomcat:7.0.109-jdk8-openjdk-slim-buster@sha256:429a25e0870545b4c9209fc7d048f1cd36a588f47b5088f8e130e49e7214353d
FROM tomcat:8.5.83-jdk8-temurin-jammy

# default context path is the root, making the full URL e.g. http://localhost:8080/
ENV CONTEXT_PATH=""
Expand Down
2 changes: 0 additions & 2 deletions server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
Expand Down

0 comments on commit 0400220

Please sign in to comment.