From 6e1432b5e744f794f0d360d77bb9aa25427f9744 Mon Sep 17 00:00:00 2001 From: "Michael A. Neilson" Date: Thu, 20 Aug 2026 16:24:07 +0000 Subject: [PATCH 1/2] Update Tomcat. --- Dockerfile | 10 +++++----- gradle/libs.versions.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75f9d71e5..5295b5e0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,11 +24,11 @@ RUN apk --no-cache upgrade && \ RUN mkdir /download && \ cd /download && \ - wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.118/bin/apache-tomcat-9.0.118.tar.gz && \ - echo "737367433486757ccd687329d99b1188506cdec57a53a29b415173909c38cdf9da4fc9fd73b8cd17cd0a8def8610ad43bab8e84393dc904a0bd1121da8cab2fc *apache-tomcat-9.0.118.tar.gz" > checksum.txt && \ + wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.121/bin/apache-tomcat-9.0.121.tar.gz && \ + echo "16494dd4745f808d3c506807b5275521fd71044d976f441d18eeeab0f5a38bc1b5344ca395292f6f26eb7612cd8c8e746d01ccdfb29893d394052d9f4b1f4c11 *apache-tomcat-9.0.121.tar.gz" > checksum.txt && \ sha512sum -c checksum.txt && \ tar xzf apache-tomcat-*tar.gz && \ - mv apache-tomcat-9.0.118 /usr/local/tomcat/ && \ + mv apache-tomcat-9.0.121 /usr/local/tomcat/ && \ cd / && \ rm -rf /usr/local/tomcat/webapps/* && \ mkdir /usr/local/tomcat/webapps/ROOT && \ @@ -41,8 +41,8 @@ RUN mkdir /download && \ # Additionally, when we are not also accounting for some legacy systems, we will likely shift to # Jetty, or Embedded Tomcat, to simplify the deployment process, making this subtitution unnecessary. RUN cd /download && \ - wget https://repo1.maven.org/maven2/com/github/tomcat-slf4j-logback/tomcat9-slf4j-logback/9.0.115/tomcat9-slf4j-logback-9.0.115.jar && \ - echo "cb463fb246fbb326d91b04a7280474f2b722b11cc9d3d7f6c3dbbefcff2c07e055f479d436ab785668d6fa90d0bfd325c86c4fa3a9ad9521159a2a3114916d91 *tomcat9-slf4j-logback-9.0.115.jar" > checksum.logback.txt && \ + wget https://repo1.maven.org/maven2/com/github/tomcat-slf4j-logback/tomcat9-slf4j-logback/9.0.120/tomcat9-slf4j-logback-9.0.120.jar && \ + echo "a24f49d57012472701172d8ec4509faa781a57a51e63b329441bdef80861e4550577fe703a333a7c5a6d5159ff14e96a16be631acef5df2ce14ec3c8cd6dae75" > checksum.logback.txt && \ sha512sum -c checksum.logback.txt RUN cd /download && \ cp tomcat9-slf4j-logback-9.0.115.jar /usr/local/tomcat/bin/tomcat-juli.jar && \ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0377e7552..415b66c0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ google-findbugs = "3.0.2" error_prone_annotations = "2.15.0" cwms-ratings = "4.2.3" javalin = "4.6.8" -tomcat = "9.0.118" +tomcat = "9.0.121" swagger-core = "2.2.23" jackson = "2.22.2" geojson-jackson = "1.14" From 01475a31a54c66151e8a199e63b40e0dd5a58e37 Mon Sep 17 00:00:00 2001 From: "Michael A. Neilson" Date: Thu, 20 Aug 2026 17:16:36 +0000 Subject: [PATCH 2/2] Correct tomcat logback jar checksum setup. --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5295b5e0d..f85ec4c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN gradle prepareDockerBuild --info --no-daemon -FROM alpine:3.21.3 AS tomcat_base +FROM alpine:3.23.5 AS tomcat_base RUN apk --no-cache upgrade && \ apk --no-cache add \ openjdk11-jre \ @@ -40,12 +40,12 @@ RUN mkdir /download && \ # with other code. # Additionally, when we are not also accounting for some legacy systems, we will likely shift to # Jetty, or Embedded Tomcat, to simplify the deployment process, making this subtitution unnecessary. -RUN cd /download && \ +RUN cd /download && \ wget https://repo1.maven.org/maven2/com/github/tomcat-slf4j-logback/tomcat9-slf4j-logback/9.0.120/tomcat9-slf4j-logback-9.0.120.jar && \ - echo "a24f49d57012472701172d8ec4509faa781a57a51e63b329441bdef80861e4550577fe703a333a7c5a6d5159ff14e96a16be631acef5df2ce14ec3c8cd6dae75" > checksum.logback.txt && \ + echo "a24f49d57012472701172d8ec4509faa781a57a51e63b329441bdef80861e4550577fe703a333a7c5a6d5159ff14e96a16be631acef5df2ce14ec3c8cd6dae75 tomcat9-slf4j-logback-9.0.120.jar" > checksum.logback.txt && \ sha512sum -c checksum.logback.txt RUN cd /download && \ - cp tomcat9-slf4j-logback-9.0.115.jar /usr/local/tomcat/bin/tomcat-juli.jar && \ + cp tomcat9-slf4j-logback-9.0.120.jar /usr/local/tomcat/bin/tomcat-juli.jar && \ rm /usr/local/tomcat/conf/logging.properties && \ rm -rf /download CMD ["/usr/local/tomcat/bin/catalina.sh","run"]