Merge pull request #468 from mcneilco/ACAS-819

ACAS-819: Update tomcat to 9.0.97

Dockerfile-multistage

@@ -1,7 +1,7 @@
 ARG 	CHEMISTRY_PACKAGE=bbchem
-FROM maven:3-openjdk-11 as builder
+FROM maven:3-openjdk-11 AS builder
 
-FROM 	builder as compile
+FROM 	builder AS compile
 ARG     CHEMISTRY_PACKAGE
 ENV     CHEMISTRY_PACKAGE=${CHEMISTRY_PACKAGE}
 
@@ -15,7 +15,7 @@ ADD 	. /src
 RUN 	--mount=type=cache,target=/root/.m2 mvn clean && \
         mvn compile war:war -P ${CHEMISTRY_PACKAGE} 
 
-FROM tomcat:9.0.62-jre11-openjdk-slim-buster
+FROM tomcat:9.0.97-jdk11-temurin-jammy
 
 # Third and Last Step That Requires Significant (Relative) Amount of Time 
 RUN apt-get update && \
@@ -26,8 +26,8 @@ RUN apt-get update && \
       openssl 
 
 # Add nodejs for prepare config files
-ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 20.x
+ENV NPM_CONFIG_LOGLEVEL=warn
+ENV NODE_VERSION=20.x
 
 # Second Slowest Step 
 RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_VERSION | bash - && \
@@ -43,17 +43,17 @@ RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_VERSION | bash - && \
     [email protected] \
     [email protected]
 
-ENV NODE_PATH /usr/lib/node_modules
+ENV NODE_PATH=/usr/lib/node_modules
 
 # Add runner user so we don't run as root
 RUN	useradd -u 1000 -ms /bin/bash runner && \
   chown -R runner:runner /usr/local/tomcat/
 
 # Allow certificates to be added by runner
-RUN chgrp runner /usr/local/openjdk-11/lib/security/cacerts && \
-    chmod g+w /usr/local/openjdk-11/lib/security/cacerts && \
+RUN chgrp runner $JAVA_HOME/lib/security/cacerts && \
+    chmod g+w $JAVA_HOME/lib/security/cacerts && \
     mkdir -p /usr/lib/jvm/java/jre/lib/security && \
-    ln -s /usr/local/openjdk-11/lib/security/cacerts /usr/lib/jvm/java/jre/lib/security/cacerts
+    ln -s $JAVA_HOME/lib/security/cacerts /usr/lib/jvm/java/jre/lib/security/cacerts
 
 # Get acas-roo-server compiled code
 COPY 	--chown=runner:runner --from=compile /src/target/acas*.war /usr/local/tomcat/webapps/acas.war