Skip to content

Bump Tomcat to 11.0.x and base Docker image to JDK 21 #344

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

Open
tungleduyxyz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump Tomcat to 11.0.x and base Docker image to JDK 21 #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a4223
Bump Tomcat to 11.0.x and base Docker image to JDK 21
tungleduyxyz Sep 8, 2026
fc77a49
Fix CI failure: drop --with-ssl=yes (incompatible with Tomcat Native …
tungleduyxyz Sep 9, 2026
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
4 changes: 2 additions & 2 deletions ansible/roles/tomcat/tasks/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
# We don't use the xml module to avoid a dependency on lxml
- name: Set tomcat_version
ansible.builtin.set_fact:
tomcat_version: "{{ tomcat_metadata.content | regex_findall('<version>(9.0.*)</version>', '\\1') | last }}"
tomcat_version: "{{ tomcat_metadata.content | regex_findall('<version>(11.0.*)</version>', '\\1') | last }}"
when: tomcat_version is undefined
tags: install

- name: Install Tomcat
become: true
ansible.builtin.unarchive:
src: "http://archive.apache.org/dist/tomcat/tomcat-9/v{{ tomcat_version }}/bin/apache-tomcat-{{ tomcat_version }}.tar.gz"
src: "http://archive.apache.org/dist/tomcat/tomcat-11/v{{ tomcat_version }}/bin/apache-tomcat-{{ tomcat_version }}.tar.gz"
remote_src: true
dest: "{{ tomcat_install_dir }}"
owner: "{{ tomcat_owner }}"
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/tomcat/tasks/native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
- --prefix={{ catalina_home }}
- --with-apr={{ tomcat_apr_config_path }}
- --with-java-home={{ java_home }}
- --with-ssl=yes
chdir: "{{ tomcat_workspace.path }}/native"
changed_when: false
tags: native
Expand Down
8 changes: 4 additions & 4 deletions ansible/templates/tomcat/conf/web.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
version="6.1">
<!-- ================== Built In Servlet Definitions ==================== -->
<servlet>
<servlet-name>default</servlet-name>
Expand Down
4 changes: 2 additions & 2 deletions docker/templates/base/latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && \
libapr1 \
mysql-client \
net-tools \
openjdk-11-jdk-headless \
openjdk-21-jdk-headless \
python3-lxml \
sudo \
unzip \
Expand All @@ -33,7 +33,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*

# Configure default JAVA_HOME path
RUN ln -s java-11-openjdk-$(dpkg --print-architecture) /usr/lib/jvm/default-java
RUN ln -s java-21-openjdk-$(dpkg --print-architecture) /usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JSSE_HOME=$JAVA_HOME/jre/

Expand Down
Loading