From 229e93da9d5d10d1eab7a292f7baa665da5cd60c Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Thu, 5 Jan 2023 16:31:03 +0100 Subject: [PATCH] XDOCKER-261: Tomcat 9.0.70 makes XWiki fail --- 13/mariadb-tomcat/Dockerfile | 2 +- 13/mysql-tomcat/Dockerfile | 2 +- 13/postgres-tomcat/Dockerfile | 2 +- 14.4/mariadb-tomcat/Dockerfile | 2 +- 14.4/mysql-tomcat/Dockerfile | 2 +- 14.4/postgres-tomcat/Dockerfile | 2 +- 14/mariadb-tomcat/Dockerfile | 2 +- 14/mysql-tomcat/Dockerfile | 2 +- 14/postgres-tomcat/Dockerfile | 2 +- template/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile index 68e0589..ddf6c62 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile index 86c3934..6d86444 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile index 4fbb5f7..b6354ca 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/mariadb-tomcat/Dockerfile b/14.4/mariadb-tomcat/Dockerfile index 19885f2..fd67420 100644 --- a/14.4/mariadb-tomcat/Dockerfile +++ b/14.4/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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/mysql-tomcat/Dockerfile b/14.4/mysql-tomcat/Dockerfile index a82d382..4965457 100644 --- a/14.4/mysql-tomcat/Dockerfile +++ b/14.4/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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/postgres-tomcat/Dockerfile b/14.4/postgres-tomcat/Dockerfile index 2394318..b6a601e 100644 --- a/14.4/postgres-tomcat/Dockerfile +++ b/14.4/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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index 1928f63..bec2561 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index 28ba92b..7c00d9f 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 59b7397..06472e7 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/template/Dockerfile b/template/Dockerfile index 80e343a..7d4bb0a 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-jre11 +FROM tomcat:9.0.69-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) -- GitLab