From 1bc6747d90638e90134290d2b6c07c089ef5dc75 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 2 Sep 2021 10:22:16 +0200
Subject: [PATCH] XDOCKER-200: Migrates from adoptopenjdk to temurin base
images
---
12/mysql-tomcat/Dockerfile | 2 +-
12/postgres-tomcat/Dockerfile | 2 +-
13/mysql-tomcat/Dockerfile | 2 +-
13/postgres-tomcat/Dockerfile | 2 +-
template/Dockerfile | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index fbbf0b9..930896c 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/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:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index c9f6f00..e6de267 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/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:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 9e676e7..32dfcfe 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:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 2c19d4d..0b79fc5 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:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/template/Dockerfile b/template/Dockerfile
index d80241e..23feb58 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -18,9 +18,9 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
<% if (xwikiVersion.startsWith('10.'))
- print 'FROM tomcat:8-jdk8-adoptopenjdk-hotspot'
+ print 'FROM tomcat:8-jdk8-temurin'
else
- print 'FROM tomcat:8-jdk11-adoptopenjdk-hotspot'
+ print 'FROM tomcat:8-jdk11-temurin'
%>
# ____ ____ ____ ____ _ __ _
--
GitLab