Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade tomcat to 9.0.91 #2040

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Upgrade tomcat to 9.0.91 #2040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk

COPY /wfnews-war/target/wfnews-war-1.0.0.war .

Expand Down
2 changes: 1 addition & 1 deletion server/wfnews-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk

COPY /wfnews-api-rest-endpoints/target/wfnews-api-rest-endpoints-1.0.0-SNAPSHOT.war .

Expand Down
10 changes: 5 additions & 5 deletions server/wfnews-api/openshift/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ objects:
local: false
tags:
- annotations:
openshift.io/imported-from: 'tomcat:9.0.85-jdk17-openjdk'
openshift.io/imported-from: 'tomcat:9.0.91-jdk17-openjdk'
from:
kind: DockerImage
name: 'tomcat:9.0.85-jdk17-openjdk'
name: 'tomcat:9.0.91-jdk17-openjdk'
generation: 2
importPolicy: {}
name: '9.0.85-jdk17-openjdk'
name: '9.0.91-jdk17-openjdk'
referencePolicy:
type: Source
- apiVersion: image.openshift.io/v1
Expand Down Expand Up @@ -190,7 +190,7 @@ objects:
memory: 1Gi
source:
dockerfile: |-
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk
ENV TOMCAT_HOME=/usr/local/tomcat \
CATALINA_HOME=/usr/local/tomcat \
CATALINA_OUT=/usr/local/tomcat/logs
Expand Down Expand Up @@ -218,7 +218,7 @@ objects:
imageOptimizationPolicy: SkipLayers
from:
kind: ImageStreamTag
name: wfone-notifications-api-tomcat:9.0.85-jdk17-openjdk
name: wfone-notifications-api-tomcat:9.0.91-jdk17-openjdk
type: Docker
triggers:
- imageChange:
Expand Down
4 changes: 2 additions & 2 deletions server/wfone-notification-push-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk
ENV TOMCAT_MAJOR=9 \
JAVA_OPTS="$JAVA_OPTS -Djavax.net.debug=all" \
TOMCAT_VERSION=9.0.85 \
TOMCAT_VERSION=9.0.91 \
TOMCAT_HOME=/usr/local/tomcat \
CATALINA_HOME=/usr/local/tomcat \
CATALINA_OUT=/usr/local/tomcat/logs
Expand Down
2 changes: 1 addition & 1 deletion server/wfone-notifications-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk

COPY /wfone-notifications-api-rest-endpoints/target/wfone-notifications-api-rest-endpoints-*.war .

Expand Down
4 changes: 2 additions & 2 deletions server/wfss-pointid-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk
ENV TOMCAT_MAJOR=9 \
JAVA_OPTS="$JAVA_OPTS -Djavax.net.debug=all -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=2 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -XX:+ExitOnOutOfMemoryError -XX:+PrintFlagsFinal" \
TOMCAT_VERSION=9.0.85 \
TOMCAT_VERSION=9.0.91 \
TOMCAT_HOME=/usr/local/tomcat \
CATALINA_HOME=/usr/local/tomcat \
CATALINA_OUT=/usr/local/tomcat/logs
Expand Down
12 changes: 6 additions & 6 deletions server/wfss-pointid-api/openshift/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ objects:
local: false
tags:
- annotations:
openshift.io/imported-from: 'tomcat:9.0.85-jdk17-openjdk'
openshift.io/imported-from: 'tomcat:9.0.91-jdk17-openjdk'
from:
kind: DockerImage
name: 'tomcat:9.0.85-jdk17-openjdk'
name: 'tomcat:9.0.91-jdk17-openjdk'
generation: null
importPolicy: {}
name: '9.0.85-jdk17-openjdk'
name: '9.0.91-jdk17-openjdk'
referencePolicy:
type: Local
- apiVersion: build.openshift.io/v1
Expand Down Expand Up @@ -164,10 +164,10 @@ objects:
memory: 1Gi
source:
dockerfile: |-
FROM tomcat:9.0.85-jdk17-openjdk
FROM tomcat:9.0.91-jdk17-openjdk

ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.85 \
TOMCAT_VERSION=9.0.91 \
TOMCAT_HOME=/usr/local/tomcat \
CATALINA_HOME=/usr/local/tomcat \
CATALINA_OUT=/usr/local/tomcat/logs \
Expand Down Expand Up @@ -198,7 +198,7 @@ objects:
imageOptimizationPolicy: SkipLayers
from:
kind: ImageStreamTag
name: 'wfss-pointid-api-tomcat:9.0.85-jdk17-openjdk'
name: 'wfss-pointid-api-tomcat:9.0.91-jdk17-openjdk'
type: Docker
triggers:
- imageChange:
Expand Down
Loading