From d989c4680ecf5645ca1d26acea2acae81e02dec9 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Wed, 4 May 2022 16:12:22 +0200
Subject: [PATCH] XDOCKER-233: Use a Java JRE and not a JDK

---
 13/mariadb-tomcat/Dockerfile  | 2 +-
 13/mysql-tomcat/Dockerfile    | 6 +++---
 13/postgres-tomcat/Dockerfile | 2 +-
 14/mariadb-tomcat/Dockerfile  | 2 +-
 14/mysql-tomcat/Dockerfile    | 6 +++---
 14/postgres-tomcat/Dockerfile | 2 +-
 template/Dockerfile           | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile
index 568203a..4dd0376 100644
--- a/13/mariadb-tomcat/Dockerfile
+++ b/13/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 81941b1..b0b4595 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.28"
-ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e"
+ENV MYSQL_JDBC_VERSION="8.0.29"
+ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 2933090..d3b3f13 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 5d452dd..56fc3ed 100644
--- a/14/mariadb-tomcat/Dockerfile
+++ b/14/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index 1fa824f..180f8aa 100644
--- a/14/mysql-tomcat/Dockerfile
+++ b/14/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.28"
-ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e"
+ENV MYSQL_JDBC_VERSION="8.0.29"
+ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile
index 74c373f..b4381ef 100644
--- a/14/postgres-tomcat/Dockerfile
+++ b/14/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/template/Dockerfile b/template/Dockerfile
index 310ee77..ca4a1e1 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
-- 
GitLab