Merge pull request #344 from killbill/jruby10-tomcat-upgrade

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

Author: xsalefter

.github/workflows/kpm_release.yml

@@ -52,7 +52,7 @@ jobs:
         uses: actions/setup-java@v3.3.0
         if: github.event.inputs.snapshot_only == 'false'
         with:
-          java-version: 11
+          java-version: 21
           distribution: temurin
           server-id: central
           server-username: MAVEN_USERNAME
@@ -63,7 +63,7 @@ jobs:
         uses: actions/setup-java@v3.3.0
         if: github.event.inputs.snapshot_only == 'true'
         with:
-          java-version: 11
+          java-version: 21
           distribution: temurin
           server-id: sonatype-nexus-snapshots
           server-username: MAVEN_USERNAME

ansible/README.md

@@ -31,7 +31,7 @@ The roles can now be referenced in your playbooks via `killbill-cloud/ansible/ro
 
 Requirements:
 
-* Java must be pre-installed on the target hosts (e.g. install the openjdk-11-jdk-headless package on Ubuntu). In the rest of this documentation, we will assume `$TARGET_JAVA_HOME` points to the Java home installation on the *target* hosts (e.g. `/usr/lib/jvm/java-11-openjdk-amd64`).
+* Java must be pre-installed on the target hosts (e.g. install the openjdk-21-jdk-headless package on Ubuntu). In the rest of this documentation, we will assume `$TARGET_JAVA_HOME` points to the Java home installation on the *target* hosts (e.g. `/usr/lib/jvm/java-21-openjdk-amd64`).
 * Before installing Kill Bill and/or Kaui, KPM must be installed via the kpm.yml playbook.
 
 

ansible/roles/tomcat/tasks/main.yml

@@ -27,8 +27,9 @@
     mode: "{{ item.mode }}"
     owner: "{{ tomcat_owner }}"
     group: "{{ tomcat_group }}"
-    # If the files already exist, don't clobber them
-    force: false
+    # Preserve existing user-managed files, except setenv.sh: its JVM
+    # hostname must be refreshed when the inventory/configuration changes.
+    force: "{{ item.force | default(false) }}"
   with_items:
     - src: tomcat/conf
       name: context.xml
@@ -42,6 +43,7 @@
       name: setenv.sh
       mode: u=rwx,g=rx,o=rx
       dest: "{{ catalina_base }}/bin"
+      force: true
     - src: tomcat/conf
       name: web.xml
       mode: u=rw,g=r,o=r

ansible/templates/tomcat/conf/web.xml.j2

@@ -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>

docker/README.adoc

@@ -10,7 +10,7 @@ toc::[]
 [[available-images]]
 ## Available images
 
-* `killbill/base:latest`: Shared base image with Tomcat and KPM inside Ubuntu 20.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud. It starts Tomcat on startup.
+* `killbill/base:latest`: Shared base image with Tomcat and KPM inside Ubuntu 24.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud. It starts Tomcat on startup.
 * `killbill/killbill:latest`: Empty base Kill Bill image. Includes the `killbill-flyway` utility. It runs `kpm install` on startup. If no custom `kpm.yml` file is specified, the latest version of Kill Bill is downloaded.
 * `killbill/killbill:0.X.Y`: Image with a specific version of Kill Bill installed.
 * `killbill/kaui:latest`: Empty base Kaui image. It runs `kpm install` on startup. If no custom `kpm.yml` file is specified, the latest version of Kaui is downloaded.

docker/templates/base/latest/Dockerfile

@@ -11,6 +11,7 @@ ENV PYTHONIOENCODING=utf8
 # https://github.com/moby/moby/issues/4032
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
+    apt-get upgrade -y && \
     apt-get install --no-install-recommends -y \
       ansible \
       # https://github.com/tianon/docker-brew-ubuntu-core/issues/59

docker/templates/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL maintainer="killbilling-users@googlegroups.com"
 
 USER root
@@ -29,7 +29,7 @@ RUN apt-get update && \
       maven \
       mysql-client \
       net-tools \
-      openjdk-11-jdk-headless \
+      openjdk-21-jdk-headless \
       postgresql-client \
       python3-lxml \
       software-properties-common \
@@ -41,8 +41,8 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Configure default JAVA_HOME path
-RUN update-java-alternatives -s java-1.11.0-openjdk-$(dpkg --print-architecture)
-RUN rm -f /usr/lib/jvm/default-java && ln -s java-11-openjdk-$(dpkg --print-architecture) /usr/lib/jvm/default-java
+RUN update-java-alternatives -s java-1.21.0-openjdk-$(dpkg --print-architecture)
+RUN rm -f /usr/lib/jvm/default-java && 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/