From a1effa1dc51b3d3b478d7250ca1ffdbdc2bdeae7 Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Mon, 29 Aug 2022 13:29:27 +0200 Subject: [PATCH] XDOCKER-241: Tomcat 9-jre11 base image move to eclipse-temurin makes XWiki image unusable * Go back to 9-jre11 (will document a workaround for users hitting the problem) --- 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 0661ba7..beef439 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile index 6975f10..bf41d8a 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile index 6d51515..4359404 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/mariadb-tomcat/Dockerfile b/14.4/mariadb-tomcat/Dockerfile index b8c636c..854fdaf 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/mysql-tomcat/Dockerfile b/14.4/mysql-tomcat/Dockerfile index d5a1df3..a3479dd 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14.4/postgres-tomcat/Dockerfile b/14.4/postgres-tomcat/Dockerfile index 18af45b..aa3fd51 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index ebe551b..d0fdd3a 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index 10dd260..cac449f 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 0d4d693..2414f15 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-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/template/Dockerfile b/template/Dockerfile index fb5189a..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-jre11-openjdk +FROM tomcat:9-jre11 # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) -- GitLab